diff --git a/po/documentation.de.po b/po/documentation.de.po
index d8a594212978c602da7a4d157380ce3e93b21eb1..61d44baebb420653d25b44522f51f10b3f30018e 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -7,10 +7,22 @@
 # Matthias A횩hauer <mha1993@live.de>, 2019.
 # Andrea Bruehlmann <login@swisscreatebusinessmanager.com>, 2019.
 msgid ""
-msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-05-17 17:03+0200\nPO-Revision-Date: 2021-06-22 20:34+0000\nLast-Translator: Christian Eichert <c@zp1.net>\nLanguage-Team: Matthias A횩hauer <mha1993@live.de>\nLanguage: de\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n != 1;\nX-Generator: Weblate 4.7.1-dev\n"
+msgstr ""
+"Project-Id-Version: git documentation\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
+"PO-Revision-Date: 2021-06-22 20:34+0000\n"
+"Last-Translator: Christian Eichert <c@zp1.net>\n"
+"Language-Team: Matthias A횩hauer <mha1993@live.de>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.7.1-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -73,7 +85,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr "<Anfang> und <Ende> sind optional.``-L <Anfang>'' oder ``-L <Anfang>,'' geht von <Anfang> bis zum Dateiende. ``-L ,<Ende>'' geht vom Dateianfang bis <Ende>."
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -85,7 +97,7 @@ msgid "Show long rev (Default: off)."
 msgstr "Zeige lange Revisionsnummer an (Standard: aus)."
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 msgid "-t"
 msgstr "-t"
@@ -121,7 +133,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:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -133,7 +145,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2868,7 +2880,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2902,139 +2914,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr "merge.<Treiber>.name"
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr "merge.<Treiber>.driver"
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr "merge.<Treiber>.recursive"
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3928,13 +3940,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr "Generiert einfache Patches ohne irgendwelche Diffstats."
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -4021,33 +4033,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -4056,7 +4068,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4563,7 +4575,7 @@ msgid "Synonym for `-p --stat`."
 msgstr "Synonym f체r `-p --stat`."
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4597,7 +4609,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr "Ohne diese Option werden Pfadnamen mit �엞n체blichen�� Zeichen in Anf체hrungszeichen gesetzt, wie es f체r die Konfigurations-Variable `core.quotePath` definiert ist (siehe linkgit:git-config[1])."
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4831,7 +4843,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "횆nderungen der Leerzeichen am Zeilenende (EOL) ignorieren."
@@ -4843,7 +4855,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 "Ver채nderungen in der Anzahl der Leerzeichen ignorieren.  Dadurch werden Leerzeichen am Zeilenende ignoriert und alle anderen Zeilenfolgen mit einem oder mehreren Leerzeichen als gleichwertig betrachtet."
@@ -5197,79 +5209,79 @@ msgid "-l<num>"
 msgstr "-l<Anz>"
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5278,431 +5290,431 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr "-O<Steuer-Datei>"
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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 "Steuert die Reihenfolge der Dateien in der Ausgabe. Dies setzt die Konfigurations-Variable `diff.orderFile` au횩er Kraft (siehe linkgit:git-config[1]).  Um `diff.orderFile` zu stornieren, benutzen Sie `-O/dev/null`."
 
 #. type: Plain text
-#: en/diff-options.txt:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 #| msgid "--output=<file>"
 msgid "--skip-to=<file>"
 msgstr "--output=<Datei>"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 #| msgid "--template=<file>"
 msgid "--rotate-to=<file>"
 msgstr "--template=<Datei>"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr "--relative[=<Pfad>]"
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-paths=<regex>"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-paths=<Regex>"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, fuzzy, priority:280
 #| msgid "This option may be specified more than once."
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr "Diese Option kann mehr als einmal angegeben werden."
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr "-W"
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr "--ignore-submodules[=<wenn>]"
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr "--src-prefix=<Pr채fix>"
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr "--dst-prefix=<Pr채fix>"
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr "--line-prefix=<Pr채fix>"
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5840,55 +5852,74 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
-#, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+#: en/fetch-options.txt:68
+#, fuzzy, priority:220
+#| msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr "Siehe auch die Konfigurationsvariable `fetch.negotiationAlgorithm`, die in linkgit:git-config[1] dokumentiert ist."
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5896,397 +5927,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr "-P"
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr "--jobs=<Anz>"
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr "--submodule-prefix=<Pfad>"
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr "--upload-pack <Upload-Pack>"
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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 "Wird diese Option angegeben und das anzufordernde Repository mit 'git fetch-pack' bearbeitet wurde, dann wird dem Befehl `--exec=<upload-pack>` 체bergeben, um den auf der entfernten Seite auszuf체hrenden Befehl anzugeben."
 
 #. type: Labeled list
-#: en/fetch-options.txt:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "Gib ausf체hrliche Informationen aus."
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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 standardm채횩ig auf der Standardfehlerausgabe angezeigt, wenn diese an ein Terminal angebunden ist, au횩er wenn -q angegeben ist. Dieses Flag erzwingt die Fortschrittsanzeige auch ohne Terminalanbindung."
 
 #. type: Labeled list
-#: en/fetch-options.txt:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr "-o <Option>"
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<Option>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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 "횥bertragen Sie die angegebene Zeichenfolge an den Server, wenn Sie mit Protokollversion 2 kommunizieren.  Die angegebene Zeichenfolge darf kein NUL- oder LF-Zeichen enthalten.  Die Behandlung von Server-Optionen, einschlie횩lich unbekannter, durch den Server ist serverspezifisch.  Wenn mehrmals `--server-option=<Option>` angegeben wird, werden sie alle, wie in angegebenen Reihenfolge, an die andere Seite gesendet."
 
 #. type: Labeled list
-#: en/fetch-options.txt:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6374,13 +6405,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "Bitte lesen Sie linkgit:git-commit[1] f체r Alternativen zum Hinzuf체gen von Inhalt zu einem Commit."
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OPTIONEN"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr "<Pfadspezifikation>..."
@@ -6410,7 +6441,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr "Erzwingt das Hinzuf체gen normalerweise ignorierter Dateien."
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6440,13 +6471,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr "Dadurch wird praktisch `add --interaktiv` ausgef체hrt, aber das anf채ngliche Befehlsmen체 wird umgangen und direkt zum Unterbefehl `patch` weitergeleitet. Siehe �얢nteraktiver Modus�� f체r weitere Details."
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6620,31 +6651,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr "횥berschreibt das Executable-Bit der hinzugef체gten Dateien.  Das Executable-Bit wird nur im Index ge채ndert, die Dateien auf der Festplatte bleiben unver채ndert."
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<Datei>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr "Die Pfadangabe wird in `<Datei>` statt 체ber Befehlszeilen-Argumente 체bergeben. Wenn `<Datei>` genau `-` ist, wird die Standardeingabe verwendet. Pfadspezifische Elemente werden durch LF oder CR/LF getrennt. Pathspec-Elemente k철nnen in Anf체hrungszeichen gesetzt werden, wie f체r die Konfigurations-Variable `core.quotePath` beschrieben (siehe linkgit:git-config[1]). Siehe auch `--pathspec-file-nul` und global `--literal-pathspecs`."
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr "Nur sinnvoll mit `--pathspec-from-file`. Pfadspezifische Elemente werden mit dem Steuerzeichen-Code NULL getrennt und alle anderen Zeichen werden unver채ndert 체bernommen (einschlie횩lich der Zeilenumbr체che und Anf체hrungszeichen)."
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr "\\--"
@@ -6656,7 +6687,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:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "BEISPIELE"
@@ -7034,7 +7065,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr "횆ndern des Inhalts von Kontextzeilen oder entfernen von Zeilen"
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
@@ -7046,13 +7077,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "Teil der linkgit:git[1] Suite"
@@ -7491,7 +7522,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr "ER횜RTERUNG"
@@ -7703,7 +7734,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -8003,7 +8034,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr "KONFIGURATION"
@@ -8273,7 +8304,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8412,7 +8443,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12424,7 +12455,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr "Das ist vergleichbar mit dem vorherigen Modus, aber Sie k철nnen die interaktive Schnittstelle verwenden, um die �엀iff��-Ausgabe einzublenden und auszuw채hlen, welche Teile im Resultat verwendet werden sollen.  Siehe unten die Beschreibung der Option `--patch`."
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr "Leise, unterdr체cke Hinweisnachrichten."
@@ -12810,7 +12841,7 @@ msgid "Limits the paths affected by the operation."
 msgstr "Legt die von der Operation betroffenen Pfade fest."
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr "Mehr Details finden Sie im 'pathspec'-Eintrag in linkgit:gitglossary[7]."
@@ -13111,10 +13142,10 @@ msgstr "$ git checkout mytopic\n"
 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 "Der \"falsche\" Branch und der korrekte Branch \"mytopic\" k철nnen sich in lokal ge채nderten Dateien unterscheiden, was daz f체hrt, dass der obige Checkout folgenderma횩en fehlschl채gt:"
 
+#. type: delimited block -
 # git-checkout.txt is not up to date. The fuzzy msgid is the message prior to 142183d0 2010-07-09 "checkout: accord documentation to what git does", the msgid is the message in the documentation afterwards.
 # At that time there weren't even po files in the git tree. This message does not exist since 23cbf11b 2010-08-11 "merge-recursive: porcelain messages for checkout".
 # The current message is "Your local changes to the following files would be overwritten by merge:\n%%s" as of 2e3926b9 2016-05-13 "i18n: unpack-trees: avoid substituting only a verb in sentences"
-#. type: delimited block -
 #: en/git-checkout.txt:569
 #, fuzzy, no-wrap, priority:240
 #| msgid ""
@@ -14289,7 +14320,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr "Diese Standard-Konfiguration wird durch Anlegen einer Referenz auf den 'HEAD' der Remote-Branch unter `refs/remotes/origin` und der Einrichtung der Konfigurations-Variablen `remote.origin.url` und `remote.origin.fetch` erreicht."
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14313,7 +14344,10 @@ msgid ""
 "*NOTE*: this operation can race with concurrent modification to the\n"
 "source repository, similar to running `cp -r src dst` while modifying\n"
 "`src`.\n"
-msgstr "*HINWEIS*: Dieser Vorgang kann mit gleichzeitigen 횆nderungen am\nQuell-Repository konkurrieren, 채hnlich wie beim Ausf체hren von \n`cp -r src dst` bei gleichzeitigem 횆ndern von `src`.\n"
+msgstr ""
+"*HINWEIS*: Dieser Vorgang kann mit gleichzeitigen 횆nderungen am\n"
+"Quell-Repository konkurrieren, 채hnlich wie beim Ausf체hren von \n"
+"`cp -r src dst` bei gleichzeitigem 횆ndern von `src`.\n"
 
 #. type: Labeled list
 #: en/git-clone.txt:65
@@ -15103,7 +15137,7 @@ msgid "Discussion"
 msgstr "Diskussion"
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr "DATEIEN"
@@ -15224,7 +15258,7 @@ msgstr "Merke automatisch alle modifizierten und gel철schten Dateien zum Commit
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15355,7 +15389,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15367,7 +15401,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -16128,559 +16162,555 @@ msgid "On success, the command returns the exit code 0."
 msgstr "Bei erfolgreichem Abschluss gibt der Befehl den Exit-Code 0 zur체ck."
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, fuzzy, priority:100
 #| msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the value_regex)."
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr "Das Standardverhalten ist, h철chstens eine Zeile zu ersetzen. Dies ersetzt alle Zeilen, die dem Schl체ssel entsprechen (und eventuell dem Wert_Regex)."
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, fuzzy, priority:100
 #| msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the value_regex in `--replace-all`."
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr "F체gt der Option eine neue Zeile hinzu, ohne bestehende Werte zu 채ndern.  Das entspricht der Angabe von '^$' als Regex-Wert (value_regex) in `--replace-all`."
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr "Liefert den Wert f체r einen angegebenen Schl체ssel (optional gefiltert durch einen dem Wert entsprechenden Regex). Gibt Fehlercode 1 zur체ck, wenn der Schl체ssel nicht gefunden wurde. Wenn mehrere Schl체sselwerte gefunden werden, wird der letzte Wert zur체ckgegeben."
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr "Entspricht `--get`, liefert aber alle Werte eines mehrwertigen Schl체ssels zur체ck."
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr "Wie `--get-all`, interpretiert den Namen aber als regul채ren Ausdruck und gibt die Schl체sselnamen aus.  Der Abgleich mit regul채ren Ausdr체cken unterscheidet derzeit zwischen Gro횩- und Kleinschreibung und erfolgt gegen eine kanonisierte Version des Schl체ssels, in der die Namen von Abschnitt und Variablen kleingeschrieben werden, die Namen von Unterabschnitten jedoch nicht."
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr "--get-urlmatch Name URL"
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr "Wenn ein zweiteiliger Name section.key angegeben ist, wird der Wert f체r section.<URL>.key zur체ckgegeben, dessen <URL>-Teil am besten zu der angegebenen URL passt (wenn kein solcher Schl체ssel existiert, wird der Wert f체r section.key als Fallback verwendet). Wenn nur der Abschnitt als Name angegeben wird, geschieht das bei allen Schl체sseln in dem Abschnitt und sie werden aufgelistet. Falls kein Wert gefunden wird, liefert der Befehl den Fehlercode 1 zur체ck."
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr "Bei Schreib-Optionen: schreibt in die globale `~/.gitconfig` Datei anstatt in die `.git/config` des Repositorys, schreibt in die `$XDG_CONFIG_HOME/git/config` Datei, wenn diese Datei existiert und die `~/.gitconfig` Datei nicht."
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr "Bei Lese-Optionen: Liest nur aus der globalen `~/.gitconfig` und aus `$XDG_CONFIG_HOME/git/config`, statt aus allen verf체gbaren Dateien."
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr "Siehe auch <<DATEIEN>>."
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr "Bei Schreib-Optionen: schreibt in die systemweite `$(prefix)/etc/gitconfig` Datei, anstatt im Repository auf `.git/config`."
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr "Bei Lese-Optionen: nur aus systemweitem `$(prefix)/etc/gitconfig` lesen, nicht aus allen verf체gbaren Dateien."
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr "Bei Schreib-Optionen: Schreibt in die `.git/config` Datei des Repositorys.  Dies entspricht dem Standardverhalten."
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr "Bei Lese-Optionen: nur aus der Repository `.git/config` lesen, nicht aus allen verf체gbaren Dateien."
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr "Analog zu `--local', au횩er dass `.git/config.worktree' gelesen oder geschrieben wird, sofern `extensions.worktreeConfig` vorhanden ist. Falls nicht, ist es identisch mit `--local`."
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr "-f Konfigurations-Datei"
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr "--file Konfigurations-Datei"
 
 #. type: Plain text
-#: en/git-config.txt:147
-#, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
-msgstr "Verwendet die genannte Konfigurations-Datei anstelle jener, die in GIT_CONFIG festgelegt ist."
+#: en/git-config.txt:149
+#, fuzzy, priority:100
+#| msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr "Bei Schreib-Optionen: schreibt in die systemweite `$(prefix)/etc/gitconfig` Datei, anstatt im Repository auf `.git/config`."
+
+#. type: Plain text
+#: en/git-config.txt:152
+#, fuzzy, priority:100
+#| msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
+msgid "For reading options: read only from the specified file rather than from all available files."
+msgstr "Bei Lese-Optionen: nur aus der Repository `.git/config` lesen, nicht aus allen verf체gbaren Dateien."
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr "--blob Blob"
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr "Analog zu `--file`, aber benutzt den genannten Blob anstelle einer Datei. Sie k철nnen z.B. 'master:.gitmodules' verwenden, um Werte aus der Datei '.gitmodules' im Master-Branch zu lesen. Siehe den Abschnitt \"REVISIONEN SPEZIFIZIEREN\" in linkgit:gitrevisions[7] f체r eine umfassende Liste von Schreibweisen f체r Blob-Namen."
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr "Entfernt den angegebenen Abschnitt aus der Konfigurations-Datei."
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr "Umbenennen des betreffenden Abschnitts auf einen neuen Namen."
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr "L철scht die Zeile, auf die der Schl체ssel passt, aus der Konfigurations-Datei."
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr "L철scht alle Zeilen, auf die der Schl체ssel passt, aus der Konfigurations-Datei."
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr "Listet alle in der Konfigurations-Datei gesetzten Variablen mit ihren Werten auf."
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr "--type <Typ>"
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr "'git config' sorgt daf체r, dass jede Eingabe oder Ausgabe unter der/den angegebenen Typ-Bedingung(en) g체ltig ist und wird ausgehende Werte in der zul채ssigen Form von `<Typ>`ausgeben."
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr "Zul채ssige Werte von `<Typ>` enthalten:"
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr "'bool': die Werte entweder als �엢ahr�� (true) oder �엂alsch�� (false) deklarieren."
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr "'int': die Werte als einfache Dezimalzahlen deklarieren. Ein optionales Suffix von 'k', 'm' oder 'g' bewirkt, dass der Wert der Eingabe mit 1024, 1048576 oder 1073741824 multipliziert wird."
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr "'bool-or-int': entsprechend der obigen Beschreibung entweder nach 'bool' oder 'int' kanonisieren."
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr "'path': kanonisieren durch Hinzuf체gen einer f체hrenden `~` zum Wert von `$HOME` und `~user` zum Home-Verzeichnis f체r den angegebenen Benutzer. Dieser Spezifizierer hat keine Auswirkung, wenn ein Wert gesetzt wird (aber Sie k철nnen `git config section.variable ~/` von der Kommandozeile aus benutzen, um Ihre Shell die Erweiterung durchf체hren zu lassen)"
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr "'expiry-date': kanonisieren durch Konvertieren von einem fixen oder relativen Datumsstring in einen Zeitstempel. Diese Angabe hat keine Auswirkung beim Setzen des Wertes."
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr "'color': Wenn Sie einen Wert erhalten, kanonisieren Sie ihn, indem Sie ihn in eine ANSI-Farb-Escape-Sequenz konvertieren. Wenn ein Wert festgelegt wurde, so wird eine 횥berpr체fung durchgef체hrt, um sicherzustellen, dass der angegebene Wert als ANSI-Farbe kanonisierbar ist, aber er wird so wie er ist ausgegeben."
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr "Historische Optionen zur Auswahl eines Typ-Bezeichners. Stattdessen sollte man besser `--type` w채hlen (siehe oben)."
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr "Setzt den zuvor eingestellten Typ-Bezeichner zur체ck, falls zuvor einer eingestellt war. Diese Option verlangt, dass 'git config' die abgerufene Variable nicht kanonisiert.  `--no-type` hat keine Wirkung ohne `--type=<type>` oder `--<type>`."
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr "F체r alle Optionen, die Werte und/oder Schl체ssel ausgeben, immer die Werte mit einem Null-Zeichen beenden (anstatt eines Zeilenumbruchs). Stattdessen sollte ein Zeilenumbruch als Trennzeichen zwischen Schl체ssel und Wert verwendet werden. Dies erm철glicht z.B. ein sicheres Parsen der Ausgabe, ohne durch in den Werten enthaltene Zeilenumbr체che verwirrt zu werden."
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr "Nur die Namen der Konfigurationsvariablen f체r `--list` oder `--get-regexp` ausgeben."
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr "Die Ausgabe aller abgefragten Konfigurationsoptionen mit dem Origin-Typ (Datei, Standardeingabe, Blob, Kommandozeile) und dem aktuellen Original (Konfigurationsdateipfad, Ref oder Blob-ID, falls zutreffend) erweitern."
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr "Vergleichbar mit `--show-origin` insoweit es die Ausgabe aller abgefragten Konfigurationsoptionen um den Rahmen dieses Wertes (lokal, global, System, Befehl) erweitert."
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr "--get-colorbool Name [Standardausgabe-ist-tty]"
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr "Finde die Farbeinstellung f체r `Name` (Beispielsweise `color.diff`)  und gib \"true\" oder \"false\" aus. `Standardausgabe-ist-tty` sollte entweder \"true\" oder \"false\" sein und wird in Betracht gezogen, wenn in der Konfigurationsdatei \"auto\" steht. Falls `Standardausgabe-ist-tty` fehlt, dann wird die Standardausgabe des Programmes selbst 체berpr체ft und gibt Status 0 zur체ck, falls Farbe verwendet wird, andernfalls wird Status 1 zur체ckgegeben.  Wenn die Farbeinstellung f체r `Name` undefiniert ist, verwendet der Befehl `color.ui` als Fallback."
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr "--get-color Name [Standard]"
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr "Findet f체r `name` die konfigurierte Farbe (z.B. `color.diff.new`) und gibt sie als ANSI-Farb-Escape-Sequenz f체r die Standardausgabe aus.  Der optionale Parameter `default` wird stattdessen verwendet, wenn f체r `name` keine Farbe konfiguriert ist."
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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=color [--default=<Vorgabe>]` wird gegen체ber `--get-color` bevorzugt (bitte aber beachten, dass `--get-color` den durch `--type=color` angeh채ngten Zeilenumbruch ausl채sst)."
 
 #. type: Plain text
-#: en/git-config.txt:265
+#: en/git-config.txt:272
 #, priority:100
 msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
 msgstr "횜ffnet einen Editor, um die angegebene Konfigurationsdatei zu 채ndern; entweder aus `--system`, `--global`, oder dem Repository (die Voreinstellung)."
 
 #. type: Labeled list
-#: en/git-config.txt:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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 "Ber체cksichtigt `include.*` Direktiven in Konfigurationsdateien, wenn Werte nachgeschlagen werden. Standardeinstellung ist `off`, wenn eine bestimmte Datei angegeben wird (z.B. mit `--file`, `--global`, usw.) und `on`, wenn alle Konfigurationsdateien durchsucht werden."
 
 #. type: Labeled list
-#: en/git-config.txt:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr "--default <Wert>"
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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 "Wird mit `--get` benutzt. Wenn die angeforderte Variable nicht gefunden wird, dann wird <Wert> so eingesetzt als ob dieser der Variablen zugewiesen wurde."
 
 #. type: Plain text
-#: en/git-config.txt:281
+#: en/git-config.txt:288
 #, 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 "`pager.config` wird nur bei der Auflistung der Konfiguration beachtet, d.h. bei der Verwendung von `--list` oder einem der `--get-*`, die mehrere Ergebnisse liefern k철nnen.  Die Voreinstellung ist die Verwendung eines Pagers."
 
 #. type: Plain text
-#: en/git-config.txt:288
+#: en/git-config.txt:295
 #, priority:100
 msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
 msgstr "Wenn nicht explizit mit `--file` ver채ndert, gibt es vier Dateien, in welchen 'git-config' nach Optionen sucht:"
 
 #. type: Labeled list
-#: en/git-config.txt:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr "$(prefix)/etc/gitconfig"
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr "Systemweite Konfigurationsdatei."
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr "$XDG_CONFIG_HOME/git/config"
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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 "Zweite benutzerspezifische Konfigurationsdatei. Wenn $XDG_CONFIG_HOME nicht gesetzt oder leer ist, wird `$HOME/.config/git/config` verwendet. Jede einwertige Variable, die in dieser Datei gesetzt ist, wird mit dem 체berschrieben, was in `~/.gitconfig` steht.  Es empfiehlt sich, diese Datei nicht zu erstellen, wenn manchmal 채ltere Versionen von Git verwendet werden, da diese Datei erst seit relativ kurzer Zeit unterst체tzt wird."
 
 #. type: Labeled list
-#: en/git-config.txt:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr "~/.gitconfig"
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr "Benutzerspezifische Konfigurationsdatei. Auch �엃lobale�� Konfigurationsdatei genannt."
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr "$GIT_DIR/config"
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr "Spezifische Konfigurationsdatei f체r das Repository."
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr "$GIT_DIR/config.worktree"
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, priority:100
 msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
 msgstr "Diese Angabe ist optional und wird nur durchsucht, wenn `extensions.worktreeConfig` in $GIT_DIR/config vorhanden ist."
 
 #. type: Plain text
-#: en/git-config.txt:316
+#: en/git-config.txt:323
 #, 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 "Falls keine weiteren Optionen gegeben sind, werden alle Leseoperationen auf allen verf체gbaren Dateien ausgef체hrt. Wenn die globale oder die systemweite Konfigurationsdateien fehlen, werden sie ignoriert. Falls die Konfigurationsdatei des Repositorys nicht verf체gbar oder lesbar ist, wird 'git config' mit einem Fehlercode, der nicht null ist, beendet. In beiden F채llen jedoch wird keine Fehlermeldung ausgegeben."
 
 #. type: Plain text
-#: en/git-config.txt:320
+#: en/git-config.txt:327
 #, 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 "Die Dateien werden in der oben angegebenen Reihenfolge gelesen, wobei der zuletzt gefundene Wert Vorrang vor fr체her gelesenen Werten hat.  Werden mehrere Werte ermittelt, dann kommen alle Werte eines Schl체ssels aus allen Dateien zum Einsatz."
 
 #. type: Plain text
-#: en/git-config.txt:323
+#: en/git-config.txt:330
 #, 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 "Einzelne Konfigurationsparameter k철nnen beim Ausf체hren eines git-Befehls mit der Option `-c` 체berschrieben werden. Siehe linkgit:git[1] f체r weitere Details."
 
 #. type: Plain text
-#: en/git-config.txt:327
+#: en/git-config.txt:334
 #, 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 "Alle Schreiboptionen schreiben standardm채횩ig in die Konfigurationsdatei des Repositorys. Beachten Sie, dass dies auch Optionen wie `--replace-all` und `--unset` betrifft. *'git config' wird immer nur eine Datei zur gleichen Zeit 채ndern*."
 
 #. type: Plain text
-#: en/git-config.txt:333
+#: en/git-config.txt:338
 #, 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 "Sie k철nnen diese Regeln entweder mit Optionen auf der Kommandozeile oder durch Umgebungsvariablen 체berschreiben. Die Optionen `--global`, `--system` und `--worktree` beschr채nken die Datei auf die globale,  systemweite bzw. �엙ro-Worktree��-Datei. Die Umgebungsvariable `GIT_CONFIG` hat einen 채hnlichen Effekt, aber Sie k철nnen jeden beliebigen Dateinamen angeben."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
+msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr "ENVIRONMENT"
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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 "Beziehe die Konfiguration aus der gegebenen Datei anstelle von .git/config. Verwenden der Option \"--global\" erzwingt dies zu ~/.gitconfig. Das Verwenden der Option \"--system\" erzwingt dies zu ${prefix}/etc/gitconfig."
-
 #. type: Labeled list
 #: en/git-config.txt:343
 #, ignore-same, no-wrap, priority:100
@@ -16744,14 +16774,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr "Angenommen wird folgende .git/config-Datei:"
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16767,7 +16809,7 @@ msgstr ""
 "#\n"
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16781,7 +16823,7 @@ msgstr ""
 "\tfilemode = false\n"
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16795,7 +16837,7 @@ msgstr ""
 "\trenames = true\n"
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16809,7 +16851,7 @@ msgstr ""
 "\tgitproxy=default-proxy ; f체r den Rest\n"
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, fuzzy, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16827,158 +16869,158 @@ msgstr ""
 "\tcookieFile = /tmp/cookie.txt\n"
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, 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:411
+#: en/git-config.txt:417
 #, fuzzy, 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:416
+#: en/git-config.txt:422
 #, 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 Proxy-Befehlseintr채ge haben tats채chlich ein entsprechendes Anh채ngsel, um zu erkennen, auf welche URL sie sich beziehen. Hier erfahren Sie, wie Sie den Eintrag f체r kernel.org in \"ssh\" 채ndern k철nnen."
 
 #. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, 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:427
+#: en/git-config.txt:433
 #, 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:431
+#: en/git-config.txt:437
 #, 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, wie core.gitproxy oben), l철schen m철chten, m체ssen Sie eine Regex f체r den Wert exakt einer Zeile angeben."
 
 #. type: Plain text
-#: en/git-config.txt:433
+#: en/git-config.txt:439
 #, 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:436
+#: en/git-config.txt:442
 #, fuzzy, 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:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr "oder"
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, fuzzy, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr "% git config core.filemode\n"
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr "oder, um eine Multivar abzufragen:"
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, 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:451
+#: en/git-config.txt:457
 #, 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:454
+#: en/git-config.txt:460
 #, 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:458
+#: en/git-config.txt:464
 #, priority:100
 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 durch einem neuen ersetzen mit"
 
 #. type: delimited block -
-#: en/git-config.txt:461
+#: en/git-config.txt:467
 #, 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:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, 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:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr "Um tats채chlich nur Werte mit einem Ausrufezeichen abzugleichen, m체ssen Sie"
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, 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:477
+#: en/git-config.txt:483
 #, 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 vorhandenen Proxys zu 채ndern, verwenden Sie"
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, 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 --add core.gitproxy '\"proxy-command\" for example.com'\n"
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, 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:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16992,13 +17034,13 @@ msgstr ""
 "echo \"${WS}Ihre Leerzeichen-Farbe oder invertiertes Blau${RESET}\"\n"
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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 "F체r URLs in `https://weak.example.com` wird `http.sslVerify` auf `false` gesetzt, w채hrend es f체r alle anderen auf `true` gesetzt wird:"
 
 #. type: delimited block -
-#: en/git-config.txt:503
+#: en/git-config.txt:509
 #, fuzzy, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -17018,19 +17060,19 @@ msgstr ""
 "http.sslverify false\n"
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr "BUGS"
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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 "Bei Verwendung der veralteten Syntax `[section.subsection]` f체hrt die 횆nderung eines Wertes dazu, dass ein mehrzeiliger Schl체ssel anstelle einer 횆nderung hinzugef체gt wird, falls der Unterabschnitt mit mindestens einem Gro횩buchstaben angegeben wird. Wenn beispielsweise die Konfiguration wie folgt aussieht"
 
 #. type: delimited block -
-#: en/git-config.txt:517
+#: en/git-config.txt:523
 #, fuzzy, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -17040,13 +17082,13 @@ msgstr ""
 "    key = value1\n"
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr "und die Ausf체hrung von `git config section.Subsection.key value2` ergibt"
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, fuzzy, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19703,103 +19745,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr "--candidates=<Anz>"
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr "--match <Muster>"
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr "--exclude <Muster>"
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19807,25 +19849,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19833,13 +19875,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19847,7 +19889,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19855,13 +19897,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19869,37 +19911,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19930,19 +19972,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr "-1 --base"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr "-2 --ours"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr "-3 --theirs"
@@ -20540,7 +20582,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:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr "<Pfad>..."
@@ -20737,14 +20779,15 @@ msgstr "Auf diese Art k철nnen Sie sich die 횆nderungen ansehen, die Sie f체r den
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
-msgstr "'git diff' [<Optionen>] <Commit> [--] [<Pfad>...]"
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
+msgstr "'git diff' [<Optionen>] <Commit> <Commit> [--] [<Pfad>...]"
 
 #. type: Plain text
 #: en/git-diff.txt:64
@@ -20752,117 +20795,123 @@ msgstr "'git diff' [<Optionen>] <Commit> [--] [<Pfad>...]"
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr "Zeigt die Unterschiede zwischen dem Arbeitsbereich und dem angegebenen <Commit> an.  Sie k철nnen HEAD verwenden, um ihn mit dem letzten Commit zu vergleichen oder den Namen eines Branchs, um ihn mit der Spitze eines anderen Branchs zu vergleichen."
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 #| msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr "'git diff' [<Optionen>] <Commit> <Commit> [--] [<Pfad>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr "Zeigt die 횆nderungen zwischen zwei beliebigen <Commit>s an."
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 #| msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr "'git diff' [<Optionen>] <Commit> [<Commit>...] <Commit> [--] [<Pfad>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, fuzzy, priority:280
 #| msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr "In dieser Form k철nnen Sie die Ergebnisse eines Merge Commits betrachten.  Der erste aufgelistete <Commit> muss der Merge selbst sein; die restlichen zwei oder mehr Commits sollten seine Eltern sein.  Ein praktischer Weg, den gew체nschten Satz von Revisionen zu erzeugen, ist die Verwendung des Suffixs {caret}@.  Wenn z.B. `master` einen Merge-Commit benennt, ergibt `git diff master master^@` das gleiche kombinierte Diff wie `git show master`."
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "'git diff' [<Optionen>] <Commit>..<Commit> [--] [<Pfad>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, fuzzy, priority:280
 #| msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr "Dieser Aufruf bewirkt das Gleiche wie der vorherige. Wird <Commit> auf einer Seite weggelassen, so wird HEAD genommen."
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "'git diff' [<Optionen>] <Commit>\\...<Commit> [--] [<Pfad>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, fuzzy, 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."
 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 "Dieser Befehl zeigt die 횆nderungen auf dem Branch an, der den zweiten <Commit> enth채lt, beginnend mit einem gemeinsamen Vorfahren beider <Commit>s, bis zum zweiten <Commit>.  \"git diff A\\...B\" ist 채quivalent zu \"git diff $(git merge-base A B) B\".  Sie k철nnen einen der beiden <Commit>s weglassen, wodurch stattdessen HEAD eingesetzt wird."
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, fuzzy, priority:280
 #| msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr "F체r alle exotischen Anwendungsf채lle, weisen wir darauf hin, dass alle <Commit>s in den vorstehenden Beschreibungen, mit Ausnahme der letzten beiden Varianten, welche die \"...\"-Notationen verwenden, beliebige <�얰erzeichnis-B채ume��> sein k철nnen."
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, fuzzy, 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]."
 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 "Eine ausf체hrlichere Liste, wie <commit> spezifiziert werden kann, findet sich in linkgit:gitrevisions[7] im Abschnitt �얬EVISIONEN SPEZIFIZIEREN��.  Allerdings vergleicht \"diff\" immer zwei Versionen (_Endpunkte_) miteinander und keine Bereiche. Die Bereichsnotationen (\"<commit>...<commit>\" und \"<commit>\\...<commit>\") bezeichnen hier also keinen 'Bereich' (Range) wie es im Abschnitt \"BEREICHE FESTLEGEN\" in linkgit:gitrevisions[7] beschrieben ist."
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr "'git diff' [<options>] <blob> <blob>"
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr "Auf diese Art lassen sich die Unterschiede zwischen den Rohinhalten zweier Blob-Objekte anzeigen."
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr "Vergleicht den Arbeitsbereich mit der \"Basis\"-Version ('base', Stufe #1), �엞nserer Branch�� ('ours', Stufe #2) oder �엀eren Branch�� ('theirs', Stufe #3).  Der Index enth채lt diese Stufen nur f체r nicht gemergte Eintr채ge, d.h. bei der Aufl철sung von Konflikten.  Siehe dazu linkgit:git-read-tree[1] Abschnitt ��3-Wege-Merge�� f체r weitere Informationen."
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr "L채sst die Diff-Ausgabe f체r nicht gemergte Beitr채ge weg und zeigt nur \"Unmerged\" an.  Kann nur verwendet werden, wenn der Arbeitsbereich mit dem Index verglichen wird."
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr "Die <Pfad>-Parameter, sofern angegeben, werden verwendet, um das diff auf die benannten Pfade zu beschr채nken (auch Verzeichnisnamen k철nnen angegeben werden, um ein diff f체r alle Dateien darin zu erhalten)."
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr "Diverse Methoden zum 횥berpr체fen ihres Arbeitsbereichs"
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20874,33 +20923,33 @@ msgstr ""
 "$ git diff HEAD       <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr "횆nderungen im Arbeitsbereich, die noch nicht im Index f체r den n채chsten Commit vorbereitet wurden."
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, fuzzy, priority:280
 #| msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr "횆nderungen zwischen dem Index und dem letzten Commit. Die Daten, die Sie committen w체rden, wenn Sie `git commit` ohne die Option `-a` ausf체hren."
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, fuzzy, priority:280
 #| msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr "횆nderungen zwischen dem Index und dem letzten Commit. Das w체rden Sie committen, wenn Sie \"git commit -a\" ausf체hren"
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr "Vergleichen beliebiger Commits"
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20912,31 +20961,31 @@ msgstr ""
 "$ git diff HEAD^ HEAD      <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr "Statt die neuesten Version des aktuellen Branchs zu verwenden, wird die neueste Version der Branch �엝est�� verglichen."
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr "Anstatt mit der neuesten Version der Branch �엝est�� zu vergleichen, wird mit der neuesten Version ('HEAD') der aktuellen Branch verglichen, allerdings ist der Vergleich auf die bezeichnete Datei ('./test') beschr채nkt."
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr "Vergleicht die Version *vor* dem letzten Commit mit dem letzten Commit."
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr "Branches vergleichen"
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20948,31 +20997,31 @@ msgstr ""
 "$ git diff topic...master  <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr "Vergleich zwischen den neuesten Versionen der 'topic' und der 'master' Branch."
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr "Wie oben."
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr "횆nderungen, die am Branch 'master' seit Start des Branch 'topic' vorgenommen wurden."
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr "Die 'diff' Ausgabe einschr채nken"
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20984,31 +21033,31 @@ msgstr ""
 "$ git diff arch/i386 include/asm-i386   <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr "Zeigt nur die 횆nderung, Umbenennung und Kopie, aber keine L철schung oder Hinzuf체gung."
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr "Zeigt nur Namen und die Art der 횆nderung, nicht aber die tats채chliche Ausgabe von diff."
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr "Schr채nkt den Vergleich auf das benannte Unterverzeichnis ein."
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr "Manipulation (munging) der 'diff'-Ausgabe"
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -21018,19 +21067,19 @@ msgstr ""
 "$ git diff -R                          <2>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr "F체hrt weitere Iterationen durch um Umbenennungen, Kopien und komplett neugeschriebene Teile zu finden (sehr zeitaufwendig!)."
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr "Ausgabe in umgekehrter Reihenfolge."
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, 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]"
 msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -28280,7 +28329,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31748,375 +31797,375 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr "--decorate-refs=<Muster>"
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr "--decorate-refs-exclude=<Muster>"
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr "Ausgabe des Referenznamen, der in der Befehlszeile angegeben wurde, 체ber welche die einzelnen Commits aufgerufen wurden."
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 "Ohne dieses Flag zeigt `git log -p <Pfad>...` Commits und Diffs f체r die angegebenen Pfade an. Damit wird der vollst채ndige Diff f체r Commits angezeigt, welche die angegebenen Pfade betreffen. Das hei횩t, dass \"<Pfad>...\" nur Commits und nicht den Diff f체r diese Commits begrenzt."
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr "[--] <Pfad>..."
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, fuzzy, no-wrap, priority:260
 #| msgid "COMMIT INFORMATION"
 msgid "DIFF FORMATTING"
 msgstr "COMMIT-INFORMATIONEN"
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr "`git log --no-merges`"
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr "Zeigt die gesamte Projektgeschichte, jedoch ohne Zusammenf체hrungen"
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, fuzzy, no-wrap, priority:260
 #| msgid "git log v2.6.12.. include/scsi drivers/scsi"
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr "`git log v2.6.12.. include/scsi drivers/scsi`"
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr "Zeigt seit der Version 'v2.6.12' alle Commits an, die Dateien in den Verzeichnissen `include/scsi` oder `drivers/scsi` ge채ndert haben."
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr "`git log --since=\"2 weeks ago\" -- gitk`"
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr "Zeigt alle 횆nderungen der Datei 'gitk' in letzten 2 Wochen an.  Die Angabe von `--` ist n철tig um Doppeldeutigkeiten mit dem Branch 'gitk' zu verhindern"
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr "`git log --name-status release..test`"
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr "Zeigt Commits, die in dem Zweig \"test\" aber nicht in dem Zweig \"release\" vorkommen, zusammen mit einer Liste alle ge채nderten Pfade je Commit an."
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr "`git log --follow builtin/rev-list.c`"
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr "Zeigt die Commits an, die `builtin/rev-list.c` ge채ndert haben, einschlie횩lich der Commits, die stattfanden, bevor die Datei ihren aktuellen Namen erhielt."
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr "`git log -3`"
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr "Limitiert die Anzahl der angezeigten Commits auf 3."
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr "Siehe linkgit:git-config[1] f체r die Verwendung von Konfigurationsvariablen und linkgit:git-diff[1] f체r Einstellungen im Zusammenhang mit der Diff-Generierung."
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr "Siehe linkgit:git-shortlog[1]."
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -37258,7 +37307,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -37274,7 +37323,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -37478,7 +37527,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -37514,7 +37563,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37623,7 +37672,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -38181,9 +38230,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-pull.txt:121
-#, priority:220
-msgid "When false, merge the current branch into the upstream branch."
-msgstr ""
+#, fuzzy, priority:220
+#| msgid "indicates the head of the current branch."
+msgid "When false, merge the upstream branch into the current branch."
+msgstr "Bezeichnet die Spitze des aktuellen Entwicklungszweigs."
 
 #. type: Plain text
 #: en/git-pull.txt:123
@@ -38668,7 +38718,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43855,115 +43905,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -45049,7 +45099,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -47453,522 +47503,541 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:170
+#, fuzzy, no-wrap, priority:100
+#| msgid "-C <commit>"
+msgid "--sendmail-cmd=<command>"
+msgstr "-C <commit>"
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
 #, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
+#, priority:100
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr "--smtp-server-option=<Option>"
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr "--batch-size=<Anz>"
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr "--confirm=<Modus>"
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47978,152 +48047,152 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, fuzzy, no-wrap, priority:100
 #| msgid "Configuration"
 msgid "Information"
 msgstr "Configuration"
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -48134,25 +48203,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -48161,19 +48230,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, 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)"
@@ -49827,254 +49896,254 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, fuzzy, no-wrap, priority:240
 #| msgid "<start-point>"
 msgid "<stash>"
 msgstr "<start-point>"
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -50083,31 +50152,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -50119,13 +50188,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -50140,13 +50209,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -50158,19 +50227,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -50185,19 +50254,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -50206,7 +50275,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -52310,7 +52379,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:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -55455,8 +55524,8 @@ msgstr ""
 msgid "`GIT_COMMON_DIR`"
 msgstr "`GIT_COMMON_DIR`"
 
-# noqa
 #. type: Plain text
+# noqa
 #: en/git.txt:524
 #, 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..."
@@ -58500,7 +58569,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58811,9 +58880,10 @@ msgstr "--reason <Zeichenkette>"
 
 #. type: Plain text
 #: en/git-worktree.txt:246
-#, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
-msgstr ""
+#, fuzzy, priority:240
+#| msgid "Restore working tree files."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
+msgstr "Dateien im Arbeitsverzeichnis wiederherstellen."
 
 #. type: Labeled list
 #: en/git-worktree.txt:247
@@ -59006,7 +59076,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -59489,7 +59559,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -63181,194 +63251,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64952,7 +65058,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -65213,56 +65319,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -65273,19 +65403,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -65297,43 +65427,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
@@ -67845,6 +67975,19 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
 
+#~ msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+#~ msgstr "Verwendet die genannte Konfigurations-Datei anstelle jener, die in GIT_CONFIG festgelegt ist."
+
+#~ 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 "Sie k철nnen diese Regeln entweder mit Optionen auf der Kommandozeile oder durch Umgebungsvariablen 체berschreiben. Die Optionen `--global`, `--system` und `--worktree` beschr채nken die Datei auf die globale,  systemweite bzw. �엙ro-Worktree��-Datei. Die Umgebungsvariable `GIT_CONFIG` hat einen 채hnlichen Effekt, aber Sie k철nnen jeden beliebigen Dateinamen angeben."
+
+#~ 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 "Beziehe die Konfiguration aus der gegebenen Datei anstelle von .git/config. Verwenden der Option \"--global\" erzwingt dies zu ~/.gitconfig. Das Verwenden der Option \"--system\" erzwingt dies zu ${prefix}/etc/gitconfig."
+
+#, ignore-ellipsis, no-wrap
+#~ msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+#~ msgstr "'git diff' [<Optionen>] <Commit> [--] [<Pfad>...]"
+
 #, fuzzy, no-wrap
 #~ msgid "--no-diff-merges:"
 #~ msgstr "--no-diff-merges"
diff --git a/po/documentation.es.po b/po/documentation.es.po
index 0c42f006d37c0493e32596309d833becfc520ce9..377f238e41e71a9940d006997bebfc9120a83928 100644
--- a/po/documentation.es.po
+++ b/po/documentation.es.po
@@ -4,10 +4,22 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-05-17 17:03+0200\nPO-Revision-Date: 2021-07-15 06:32+0000\nLast-Translator: Coral Alonso <coralonso_jimenez@outlook.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: es\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n != 1;\nX-Generator: Weblate 4.7.2-dev\n"
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
+"PO-Revision-Date: 2021-07-15 06:32+0000\n"
+"Last-Translator: Coral Alonso <coralonso_jimenez@outlook.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.7.2-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -67,7 +79,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -79,7 +91,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 msgid "-t"
 msgstr "-t"
@@ -115,7 +127,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -127,7 +139,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2811,7 +2823,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2845,139 +2857,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3861,13 +3873,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3954,33 +3966,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "--diff-merges=off"
 msgid "--diff-merges=1"
 msgstr "--diff-merges=off"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "--diff-merges=off"
 msgid "--diff-merges=separate"
@@ -3989,7 +4001,7 @@ msgstr "--diff-merges=off"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4488,7 +4500,7 @@ msgid "Synonym for `-p --stat`."
 msgstr "Sin처nimo de `-p --stat`."
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4520,7 +4532,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4747,7 +4759,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "Ignorar cambios de espacios en blanco al finalizar rengl처n."
@@ -4759,7 +4771,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5113,79 +5125,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
 
 #. type: Plain text
-#: en/diff-options.txt:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr "-S<cadena>"
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr "-G<expresi처n regular>"
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5194,431 +5206,431 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr "--find-object=<id-de-objeto>"
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--skip-to=<file>"
 msgstr "--pathspec-from-file=<fichero>"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--rotate-to=<file>"
 msgstr "--pathspec-from-file=<fichero>"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr "--relative[=<ruta>]"
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr "Tratar todos los archivos como si fueran de texto."
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr "Ignorar cambios cuyos renglones est찼n todos vac챠os."
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, fuzzy, no-wrap, priority:280
 #| msgid "-G<regex>"
 msgid "-I<regex>"
 msgstr "-G<expresi처n regular>"
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr "--inter-hunk-context=<l챠neas>"
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr "-W"
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr "--ignore-submodules[=<cuando>]"
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr "--src-prefix=<prefijo>"
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr "Mostrar el prefijo de origen indicado en lugar de 짬a/쨩."
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr "--dst-prefix=<prefijo>"
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr "Mostrar el prefijo de destino indicado en lugar de 짬b/쨩."
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr "No mostrar ning첬n prefijo de origen o de destino."
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr "--line-prefix=<prefijo>"
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr "Anteponer un prefijo adicional a cada l챠nea mostrada."
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5756,55 +5768,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
+#, priority:220
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5812,397 +5842,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr "Mantener el pack descargado."
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr "-P"
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr "--recurse-submodules[=yes|on-demand|no]"
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, fuzzy, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr "--jobs=<n>"
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr "--submodule-prefix=<ruta>"
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, fuzzy, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr "--recurse-submodules-default=[yes|on-demand]"
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr "--upload-pack <paquete-a-subir>"
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "Mostrar m찼s detalles."
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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 "El estado de avance se indica en la salida de error est찼ndar por defecto cuando esta est찼 asociada a un terminal, a menos que se especifique -q. Esta opci처n hace que sea as챠 incluso cuando la salida de error est찼ndar no es por terminal."
 
 #. type: Labeled list
-#: en/fetch-options.txt:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr "-o <opci처n>"
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<opci처n>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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 "Transmita la cadena de caracteres dada al servidor cuando haya comunicaci처n utilizando la versi처n 2 del protocolo.  La cadena de caracteres dada no debe contener ning첬n car찼cter NUL ni LF.  La gesti처n que el servidor hace de sus opciones, incluyendo las desconocidas, es espec챠fica de cada servidor.  Cuando se dan m첬ltiples \"--server-option=<option>\", todas ellas se env챠an al otro lado en el orden enumerado en la l챠nea de comandos."
 
 #. type: Labeled list
-#: en/fetch-options.txt:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr "Utilice solo direcciones IPv4, no se hace caso a las direcciones IPv6."
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr "Utilice solo direcciones IPv6, no se hace caso a las direcciones IPv4."
@@ -6290,13 +6320,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "Por favor, revise linkgit:git-commit[1] para encontrar maneras alternativas de a챰adir contenido a una confirmaci처n de cambios."
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OPCIONES"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr "<ruta>..."
@@ -6326,7 +6356,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr "Permitir a챰adir archivos que normalmente se ignoran."
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6356,13 +6386,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6536,31 +6566,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<fichero>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr "\\--"
@@ -6572,7 +6602,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "EJEMPLOS"
@@ -6936,7 +6966,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6948,13 +6978,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, fuzzy, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7393,7 +7423,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr "DISCUSI횙N"
@@ -7605,7 +7635,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7905,7 +7935,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr "CONFIGURACI횙N"
@@ -8175,7 +8205,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8314,7 +8344,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12276,7 +12306,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr "Silencioso. Suprime los mensajes de respuesta."
@@ -12660,7 +12690,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14082,7 +14112,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14884,7 +14914,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14990,7 +15020,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15120,7 +15150,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15132,7 +15162,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15843,557 +15873,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16456,14 +16480,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16474,7 +16510,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16484,7 +16520,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16494,7 +16530,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16504,7 +16540,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16516,157 +16552,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16676,13 +16712,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16695,19 +16731,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16715,13 +16751,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19358,103 +19394,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr "--match <patr처n>"
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr "Mostrar un objeto abreviado de manera 첬nica, como respaldo."
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19462,25 +19498,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19488,13 +19524,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19502,7 +19538,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19510,13 +19546,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19524,37 +19560,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19584,19 +19620,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20185,7 +20221,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20368,14 +20404,15 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
-msgstr ""
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
+msgstr "'git diff' [<opciones>] <confirmaci처n> <confirmaci처n> [--] [<ruta>...]"
 
 #. type: Plain text
 #: en/git-diff.txt:64
@@ -20383,111 +20420,117 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 #| msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr "'git diff' [<opciones>] <confirmaci처n> <confirmaci처n> [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr "'git diff' [<opciones>] <confirmaci처n> <confirmaci처n>... <confirmaci처n> [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "'git diff' [<opciones>] <confirmaci처n>..<confirmaci처n> [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "'git diff' [<opciones>] <confirmaci처n>\\...<confirmaci처n> [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20496,31 +20539,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20529,31 +20572,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20562,31 +20605,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20595,31 +20638,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20627,19 +20670,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, 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], linkgit:git-show[1]"
 msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27838,7 +27881,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31281,373 +31324,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr "Ver linkgit:git-shortlog[1]."
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36757,7 +36800,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36773,7 +36816,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36977,7 +37020,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -37013,7 +37056,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37122,7 +37165,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37677,9 +37720,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-pull.txt:121
-#, priority:220
-msgid "When false, merge the current branch into the upstream branch."
-msgstr ""
+#, fuzzy, priority:220
+#| msgid "Applies a quilt patchset onto the current branch."
+msgid "When false, merge the upstream branch into the current branch."
+msgstr "Aplica un conjunto de parches de quilt en la rama actual."
 
 #. type: Plain text
 #: en/git-pull.txt:123
@@ -38162,7 +38206,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43305,115 +43349,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44485,7 +44529,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46873,521 +46917,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47397,151 +47459,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47552,25 +47614,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47579,19 +47641,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49241,253 +49303,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<nombre-de-reserva>]"
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<nombre-de-reserva>]"
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr "store"
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49496,31 +49558,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49532,13 +49594,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49553,13 +49615,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49571,19 +49633,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49598,19 +49660,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49619,7 +49681,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51718,7 +51780,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57835,7 +57897,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58141,9 +58203,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-worktree.txt:246
-#, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
-msgstr ""
+#, fuzzy, priority:240
+#| msgid "Restore working tree files."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
+msgstr "Restaura archivos del 찼rbol de trabajo."
 
 #. type: Labeled list
 #: en/git-worktree.txt:247
@@ -58336,7 +58399,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58813,7 +58876,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62487,194 +62550,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64252,7 +64351,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64513,56 +64612,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64573,19 +64696,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64597,43 +64720,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index b14a2a9a37a66d8a9896ea371ead85993d5ad35a..b5c0c6e385041c207bacfaa9e7392d23f195bba9 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: 2021-05-17 17:03+0200\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\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"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Weblate 3.9-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -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:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 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:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -137,7 +137,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2819,7 +2819,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2853,139 +2853,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3869,13 +3869,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3962,33 +3962,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -3997,7 +3997,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4496,7 +4496,7 @@ msgid "Synonym for `-p --stat`."
 msgstr "sin처nimo para '-p --stat'"
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4528,7 +4528,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4755,7 +4755,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, fuzzy, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "ignorar cambios en espacios en blanco en EOL"
@@ -4767,7 +4767,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5121,79 +5121,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, fuzzy, no-wrap, priority:280
 msgid "-S<string>"
 msgstr "<string>"
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, fuzzy, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr "<regex>"
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5202,430 +5202,430 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-removal"
 msgid "--skip-to=<file>"
 msgstr "--ignore-removal"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-removal"
 msgid "--rotate-to=<file>"
 msgstr "--ignore-removal"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, fuzzy, priority:280
 msgid "Treat all files as text."
 msgstr "tratar todos los archivos como texto"
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, fuzzy, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr "ignora cambios cuyas l챠neas son todas en blanco"
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, fuzzy, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr "<regex>"
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, fuzzy, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, fuzzy, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr "mostrar el prefijo de destino en lugar de \"b/\""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, fuzzy, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr "no mostrar ning첬n prefijo de fuente o destino"
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, fuzzy, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr "anteponer un prefijo adicional a cada l챠nea mostrada"
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5763,55 +5763,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
+#, priority:220
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5819,397 +5837,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, fuzzy, priority:220
 msgid "Keep downloaded pack."
 msgstr "mantener el paquete descargado"
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, fuzzy, priority:300
 msgid "Be verbose."
 msgstr "ser verboso"
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6301,13 +6319,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:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OPCIONES"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr ""
@@ -6337,7 +6355,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr "Agregar archivos que normalmente ser챠an ignorados."
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6367,13 +6385,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6547,32 +6565,32 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, fuzzy, no-wrap, priority:300
 #| msgid "--ignore-removal"
 msgid "--pathspec-from-file=<file>"
 msgstr "--ignore-removal"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr ""
@@ -6584,7 +6602,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6938,7 +6956,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6950,13 +6968,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7394,7 +7412,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7606,7 +7624,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7906,7 +7924,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8176,7 +8194,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8315,7 +8333,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12279,7 +12297,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, fuzzy, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr "suprimir mensajes de feedback"
@@ -12663,7 +12681,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, fuzzy, priority:280
 #| msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
@@ -14086,7 +14104,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14879,7 +14897,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14985,7 +15003,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15115,7 +15133,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15127,7 +15145,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15838,557 +15856,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
+#, priority:100
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16451,14 +16463,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16469,7 +16493,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16479,7 +16503,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16489,7 +16513,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16499,7 +16523,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16511,157 +16535,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16671,13 +16695,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16690,19 +16714,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16710,13 +16734,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19352,103 +19376,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, fuzzy, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr "concordar <patr처n>"
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, fuzzy, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr "mostrar el objeto commit abreviado como fallback"
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19456,25 +19480,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19482,13 +19506,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19496,7 +19520,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19504,13 +19528,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19518,37 +19542,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19578,19 +19602,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20178,7 +20202,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20360,14 +20384,14 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
-msgstr ""
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
+msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 #. type: Plain text
 #: en/git-diff.txt:64
@@ -20375,110 +20399,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20487,31 +20517,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20520,31 +20550,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20553,31 +20583,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20586,31 +20616,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20618,19 +20648,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27834,7 +27864,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31271,373 +31301,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, fuzzy, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr "linkgit:git-shortlog[1]"
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36747,7 +36777,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36763,7 +36793,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36967,7 +36997,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -37003,7 +37033,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37112,7 +37142,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37667,9 +37697,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-pull.txt:121
-#, priority:220
-msgid "When false, merge the current branch into the upstream branch."
-msgstr ""
+#, fuzzy, priority:220
+msgid "When false, merge the upstream branch into the current branch."
+msgstr "Aplica un parche quilt en la rama actual"
 
 #. type: Plain text
 #: en/git-pull.txt:123
@@ -38152,7 +38182,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43295,115 +43325,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44476,7 +44506,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46861,521 +46891,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47385,151 +47433,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47540,25 +47588,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47567,19 +47615,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49230,253 +49278,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, 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:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, 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:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, fuzzy, no-wrap, priority:240
 msgid "store"
 msgstr "puntaje"
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49485,31 +49533,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49521,13 +49569,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49542,13 +49590,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49560,19 +49608,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49587,19 +49635,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49608,7 +49656,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51709,7 +51757,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57828,7 +57876,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58134,9 +58182,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-worktree.txt:246
-#, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
-msgstr ""
+#, fuzzy, priority:240
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
+msgstr "Cambia ramas o restaura los archivos de tu 찼rbol de trabajo"
 
 #. type: Labeled list
 #: en/git-worktree.txt:247
@@ -58328,7 +58376,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58806,7 +58854,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62499,194 +62547,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64264,7 +64348,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64525,56 +64609,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64585,19 +64693,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64609,43 +64717,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index c88c55d798b488617ceda20e0b3e1be5d06871f0..6e137af970d0eeb04a1b50bfcf5b39cb80fe5c84 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -3,10 +3,22 @@
 # This file is distributed under the same license as the Git package.
 # Jean-No챘l Avila <jn.avila@free.fr>, 2019.
 msgid ""
-msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-05-17 17:03+0200\nPO-Revision-Date: 2021-06-17 20:34+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.7\n"
+msgstr ""
+"Project-Id-Version: git documentation\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
+"PO-Revision-Date: 2021-06-17 20:34+0000\n"
+"Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n"
+"Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.7\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -66,7 +78,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr "'<d챕but>' et '<fin>' sont facultatifs. `-L <d챕but>` ou `-L <d챕but>,`, s�쇒쯶end de '<d챕but>' jusqu'횪 la fin du fichier. `-L,<fin>` s�쇒쯶end du d챕but du fichier jusqu'횪 '<fin>'."
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -78,7 +90,7 @@ msgid "Show long rev (Default: off)."
 msgstr "Afficher la r챕vision long (par d챕faut : d챕sactiv챕)."
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 msgid "-t"
 msgstr "-t"
@@ -114,7 +126,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
 msgstr "Parcourir l'historique en avant au lieu d'en arri챔re. Au lieu de montrer la r챕vision dans laquelle une ligne est apparue, ceci montre la derni챔re r챕vision dans laquelle une ligne a exist챕. Cela n챕cessite une gamme de r챕visions comme D횋BUT..FIN o첫 le chemin de bl창me existe dans D횋BUT.  Pour plus de commodit챕, `git blame --reverse D횋BUT` est pris comme `git blame --reverse D횋BUT..HEAD`."
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -126,7 +138,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr "Ne suivre que le premier commit parent lors de la rencontre d'un commit de fusion. Cette option peut 챗tre utilis챕e pour d챕terminer le moment o첫 une ligne a 챕t챕 introduite dans une branche d'int챕gration particuli챔re, plut척t que le moment o첫 elle a 챕t챕 introduite dans l'historique global."
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2841,8 +2853,9 @@ 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."
+#, fuzzy, 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."
+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. Defaults to true."
 msgstr "Si la fusion est appel챕e sans aucun argument de commit, fusionner les branches amont configur챕es pour la branche courante en utilisant leurs derni챔res valeurs observ챕es stock챕es dans leurs branches de suivi 횪 distance.  Les valeurs de `branch.<branche courante>.merge` qui nomment les branches distantes nomm챕es par `branch.<branche courante>.remote` sont consult챕es, puis elles sont mapp챕es via `remote.<distant>.fetch` vers leurs branches de suivi 횪 distance correspondantes, et les extr챕mit챕s de ces branches de suivi sont fusionn챕es."
 
 #. type: Labeled list
@@ -2876,139 +2889,140 @@ 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."
+#: en/config/merge.txt:42
+#, fuzzy, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr "Le nombre de fichiers 횪 prendre en compte lors de la d챕tection de renommage lors d'une fusion ; s'il n'est pas sp챕cifi챕, la valeur par d챕faut est diff.renameLimit. Ce r챕glage n'a aucun effet si la d챕tection de renommage est d챕sactiv챕e."
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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 "Indique si Git doit d챕tecter les renommages. S'il est d챕fini 횪 \"false\", la d챕tection de renommage est d챕sactiv챕e. S'il est d챕fini 횪 \"true\", la d챕tection de renommage de base est activ챕e. La valeur par d챕faut est diff.renames."
 
 #. type: Labeled list
-#: en/config/merge.txt:46
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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 "Indique si Git doit d챕tecter les noms de r챕pertoire, affectant ce qui se arrive lors d'une fusion 횪 de nouveaux fichiers ajout챕s 횪 un r챕pertoire d'un c척t챕 de l'historique lorsque ce r챕pertoire a 챕t챕 renomm챕 de l'autre c척t챕 de l'historique.  Si merge.directoryRenames est r챕gl챕 횪 \"false\", la d챕tection du r챕pertoire est d챕sactiv챕e, ce qui signifie que ces nouveaux fichiers seront laiss챕s dans l'ancien r챕pertoire.  S'il est r챕gl챕 sur \"true\", la d챕tection du r챕pertoire est activ챕e, ce qui signifie que ces nouveaux fichiers seront transf챕r챕s dans le nouveau r챕pertoire.  S'il est r챕gl챕 pour \"conflict\", un conflit sera signal챕 pour de tels chemins.  Si merge.renames est faux, merge.directoryRenames est ignor챕 et trait챕 comme faux.   Par d챕faut, la valeur est \"conflict\"."
 
 #. type: Labeled list
-#: en/config/merge.txt:59
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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 "Indiquer 횪 Git que la repr챕sentation canonique des fichiers dans le d챕p척t a chang챕 au fil du temps (par exemple, les premiers commits enregistrent les fichiers avec des fins de ligne CRLF, mais les plus r챕cents utilisent des fins de ligne LF).  Dans un tel d챕p척t, Git peut convertir les donn챕es enregistr챕es dans les commits en une forme canonique avant d'effectuer une fusion pour r챕duire les conflits inutiles.  Pour plus d'informations, voir la section \"Fusionner des branches avec des attributs d'entr챕e/de sortie diff챕rents\" dans linkgit:gitattributes[5]."
 
 #. type: Labeled list
-#: en/config/merge.txt:69
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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 "Indiquer s'il faut afficher le diffstat entre ORIG_HEAD et le r챕sultat de la fusion 횪 la fin de la fusion. Vrai par d챕faut."
 
 #. type: Labeled list
-#: en/config/merge.txt:73
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr "Lorsque r챕gl챕 sur true, cr챕er automatiquement une entr챕e temporaire de remisage avant le d챕but de l'op챕ration, et l'appliquer apr챔s la fin de l'op챕ration.  Cela signifie que vous pouvez ex챕cuter la fusion sur un arbre de travail sale.  Cependant, 횪 utiliser avec pr챕caution : l'application finale du remisage apr챔s une fusion r챕ussie peut entra챤ner des conflits non n챕gligeables.  Cette option peut 챗tre remplac챕e par les options `--no-autostash` et `--autostash` de linkgit:git-merge[1].  La valeur par d챕faut est false."
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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 "Contr척le quel outil de fusion est utilis챕 par linkgit:git-mergetool[1].  La liste ci-dessous indique les valeurs pr챕-int챕gr챕es valides.  Toute autre valeur est trait챕e comme un outil de fusion personnalis챕 et n챕cessite qu'une variable mergetool.<outil>.cmd correspondante soit d챕finie."
 
 #. type: Labeled list
-#: en/config/merge.txt:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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 "Contr척le quel outil de fusion est utilis챕 par linkgit:git-mergetool[1] lorsque le drapeau -g/--gui est sp챕cifi챕. La liste ci-dessous indique les valeurs pr챕-int챕gr챕es valides.  Toute autre valeur est trait챕e comme un outil de fusion personnalis챕 et n챕cessite qu'une variable mergetool.<outilgraphique>.cmd correspondante soit d챕finie."
 
 #. type: Labeled list
-#: en/config/merge.txt:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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 "Contr척le la quantit챕 de production affich챕e par la strat챕gie de fusion r챕cursive.  Le niveau 0 ne produit rien, sauf un message d'erreur final si des conflits ont 챕t챕 d챕tect챕s. Le niveau 1 ne produit que des conflits, le niveau 2 produit des conflits et des changements de fichiers.  Les niveaux 5 et plus produisent des informations de d챕bogage.  La valeur par d챕faut est le niveau 2.  Peut 챗tre 챕cras챕e par la variable d'environnement `GIT_MERGE_VERBOSITY`."
 
 #. type: Labeled list
-#: en/config/merge.txt:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr "merge.<pilote>.name"
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, priority:240
 msgid "Defines a human-readable name for a custom low-level merge driver.  See linkgit:gitattributes[5] for details."
 msgstr "D챕finit un nom lisible par l'homme pour un pilote de fusion personnalis챕 de bas niveau.  Voir linkgit:gitattributes[5] pour plus de d챕tails."
 
 #. type: Labeled list
-#: en/config/merge.txt:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr "merge.<pilote>.driver"
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, priority:240
 msgid "Defines the command that implements a custom low-level merge driver.  See linkgit:gitattributes[5] for details."
 msgstr "D챕finit la commande qui met en 흹uvre un pilote de fusion de bas niveau personnalis챕.  Voir linkgit:gitattributes[5] pour plus de d챕tails."
 
 #. type: Labeled list
-#: en/config/merge.txt:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr "merge.<pilote>.recursive"
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 "Nomme un pilote de fusion de bas niveau 횪 utiliser lors d'une fusion interne entre des anc챗tres communs.  Voir linkgit:gitattributes[5] pour plus de d챕tails."
@@ -3954,13 +3968,13 @@ 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:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -4044,39 +4058,41 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
-#, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+#: en/diff-options.txt:55
+#, fuzzy, priority:280
+#| msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr "Cette option permet d'afficher la sortie diff pour les commits de fusion dans le format par d챕faut. `-m` produira la sortie seulement si `-p` est donn챕 aussi. Le format par d챕faut peut 챗tre modifi챕 en utilisant le param챔tre de configuration `log.diffMerges`, dont la valeur par d챕faut est `separate`."
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, no-wrap, priority:280
 msgid "--diff-merges=first-parent"
 msgstr "--diff-merges=first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, no-wrap, priority:280
 msgid "--diff-merges=1"
 msgstr "--diff-merges=1"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr "Cette option fait en sorte que les commits de fusion montrent les diff챕rences compl챔tes, mais seulement par rapport au premier parent."
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, no-wrap, priority:280
 msgid "--diff-merges=separate"
 msgstr "--diff-merges=separate"
 
 #. type: Plain text
 #: en/diff-options.txt:66
-#, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+#, fuzzy, priority:280
+#| msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr "Cela fait que les commits de fusion montrent la diff챕rence compl챔te par rapport 횪 chacun des parents. Une entr챕e de journal et une diff챕rence s챕par챕es sont g챕n챕r챕es pour chaque parent."
 
 #. type: Labeled list
@@ -4576,7 +4592,7 @@ msgid "Synonym for `-p --stat`."
 msgstr "Synonyme de `-p --stat`."
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4610,7 +4626,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr "Sans cette option, 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: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4842,7 +4858,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "Ignorer les modifications d'espaces en fin de ligne."
@@ -4854,7 +4870,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 "Ignorer les modifications de nombre d'espaces. Cela ignore les espaces en fin de ligne et consid챔re toutes les autres s챕quences d'un caract챔re blanc ou plus comme 챕quivalentes."
@@ -5220,79 +5236,79 @@ msgid "-l<num>"
 msgstr "-l<num>"
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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 "Les options `-M` et `-C` n챕cessitent un temps de traitement en O(n짼) o첫 n est le nombre de cibles potentielles renommage/copie. Cette option emp챗che l'utilisation de la d챕tection de renommage/copie si le nombre de cibles de renommage/copie exc챔de le nombre indiqu챕."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
+msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
 
 #. type: Plain text
-#: en/diff-options.txt:609
+#: en/diff-options.txt:615
 #, 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 "S챕lectionner seulement les fichiers qui sont Ajout챕s (`A`), Copi챕s (`C`), supprim챕s (Deleted `D`), Modifi챕s (`M`), Renomm챕s (`R`), ont eu un changement de Type (`T`) (c-횪-d fichier normal, lien symbolique, sous-module ��), sont non fusionn챕s (Unmerged `U`), sont inconnus (Unknown `X`) ou ont eu leur appairage cass챕 (Broken `B`). Toute combinaison de caract챔res de filtre (incluant aucun) peut 챗tre utilis챕e. Quand `*` (Tout-ou-rien) est ajout챕 횪 la combinaison, tous les chemins sont s챕lectionn챕s s'il y a des fichiers qui correspondent aux autres crit챔res dans la comparaison혻; s'il n'y a aucun fichier qui correspond aux autres crit챔res, rien n'est s챕lectionn챕."
 
 #. type: Plain text
-#: en/diff-options.txt:612
+#: en/diff-options.txt:618
 #, priority:280
 msgid "Also, these upper-case letters can be downcased to exclude.  E.g.  `--diff-filter=ad` excludes added and deleted paths."
 msgstr "Aussi, ces lettres majuscules peuvent 챗tre sp챕cifi챕es en minuscules pour exclure. Par exemple, `--diff-filter=ad` exclut les chemins ajout챕s et supprim챕s."
 
 #. type: Plain text
-#: en/diff-options.txt:618
+#: en/diff-options.txt:624
 #, 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 "Notez que toutes les diffs ne peuvent pas pr챕senter tous les types. Par exemple, les diffs de l'index par rapport 횪 l'arbre de travail ne peuvent jamais avoir des entr챕es Ajout챕es (parce que l'ensemble des chemins inclus dans le diff est limit챕 par ce qui est pr챕sent dans l'index). Similairement, les entr챕es copi챕es et renomm챕es ne peuvent pas appara챤tre si la d챕tection de ces types est d챕sactiv챕e."
 
 #. type: Labeled list
-#: en/diff-options.txt:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr "-S<cha챤ne>"
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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 "Trouver des diff챕rences qui modifient le nombre d'occurrences de la cha챤ne sp챕cifi챕e (par ex. addition/suppression) dans un fichier. Destin챕 횪 l'usage dans des scripts."
 
 #. type: Plain text
-#: en/diff-options.txt:629
+#: en/diff-options.txt:635
 #, 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 "C'est utile lorsqu'on cherche un bloc exact de code (comme une struct), et qu'on veut conna챤tre l'historique de ce bloc depuis son apparition혻: utiliser cette fonctionnalit챕 it챕rativement pour fournir le bloc d'une pr챕-image 횪 `-S` et continuer jusqu'횪 obtenir la toute premi챔re version du bloc."
 
 #. type: Plain text
-#: en/diff-options.txt:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr "Les fichiers binaires sont aussi analys챕s."
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr "-G<regex>"
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr "Rechercher des diff챕rences dont le texte de rustine contient les lignes ajout챕es/supprim챕es correspondant 횪 <regex>."
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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 "Pour illustrer la diff챕rence entre `-S<regex> --pickaxe-regex` et `-G<regex>`, consid챕rons un commit contenant la diff suivante dans un m챗me fichier혻:"
 
 #. type: delimited block -
-#: en/diff-options.txt:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5304,427 +5320,427 @@ msgstr ""
 "-    hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr "Alors que `git log -G\"frotz\\(nitfol\"` affichera ce commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` ne l'affichera pas (parce que le nombre d'occurrences de cette cha챤ne n'a pas chang챕)."
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, priority:280
 msgid "Unless `--text` is supplied patches of binary files without a textconv filter will be ignored."
 msgstr "� moins que `--text` soit fourni, les rustines de fichiers binaires sans filtre textconv seront ignor챕es."
 
 #. type: Plain text
-#: en/diff-options.txt:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr "Voir l'entr챕e 'pickaxe' dans linkgit:gitdiffcore[7] pour plus d'information."
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr "--find-object=<id-objet>"
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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 "Rechercher les diff챕rences qui modifient le nombre d'occurrences de l'objet indiqu챕. Similaire 횪 `-S`, juste que l'argument est diff챕rent en ce qu'elle ne cherche pas une cha챤ne particuli챔re mais un identifiant d'objet particulier."
 
 #. type: Plain text
-#: en/diff-options.txt:664
+#: en/diff-options.txt:670
 #, 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 "L'objet peut 챗tre un commit de blob ou de sous-module. Cela implique l'option `-t` dans `git-log` pour trouver aussi des arbres."
 
 #. type: Labeled list
-#: en/diff-options.txt:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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 "Quand `-S` ou `-G` trouvent une modification, afficher toutes les modifications dans l'ensemble de modifications, pas seulement les fichiers qui contiennent la modification dans <cha챤ne>."
 
 #. type: Labeled list
-#: en/diff-options.txt:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, priority:280
 msgid "Treat the <string> given to `-S` as an extended POSIX regular expression to match."
 msgstr "Traiter la <cha챤ne> fournie 횪 `-S` comme une expression r챕guli챔re POSIX 챕tendue 횪 faire correspondre."
 
 #. type: Labeled list
-#: en/diff-options.txt:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr "-O<fichier-d-ordre>"
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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 "Contr척ler l'ordre dans lequel les fichiers apparaissent dans la sortie. Ceci passe outre la variable de configuration `diff.orderFile` (voir linkgit:git-config[1]). Pour annuler `diff.orderFile`, utiliser `-O/dev/null`."
 
 #. type: Plain text
-#: en/diff-options.txt:693
+#: en/diff-options.txt:699
 #, 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 "L'ordre en sortie est d챕termin챕 par l'ordre des motifs glob dans <fichier-d-ordre>. Tous les fichiers dont le nom de chemin correspond au premier motif sont affich챕s en premier, tous les fichiers dont le nom de chemin correspond au second motif (mais pas au premier) sont affich챕s ensuite, et ainsi de suite. Tous les fichiers dont les noms de chemin qui ne correspondent 횪 aucun motif sont affich챕s en dernier, comme s'il y avait un motif ramasse-tout 횪 la fin du fichier. Si de multiples noms de chemin ont le m챗me rang (ils correspondent avec le m챗me motif mais pas de motifs ant챕rieurs), leur ordre relatif d'affichage est l'ordre normal."
 
 #. type: Plain text
-#: en/diff-options.txt:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr "<fichier-d-ordre> est analys챕 comme suit혻:"
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr "Les lignes blanches sont ignor챕es, de sorte qu'elles peuvent 챗tre utilis챕es comme s챕parateurs pour la lisibilit챕."
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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 "Les lignes commen챌ant par un di챔se (\"`#`\") sont ignor챕es, elles peuvent donc 챗tre utilis챕es comme commentaires. Ajoutez une barre oblique inverse (\"`\\`\") au d챕but du motif s'il doit commencer par un di챔se."
 
 #. type: Plain text
-#: en/diff-options.txt:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr "Toutes les autres lignes contiennent un motif unique."
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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 "Les motifs ont la m챗me syntaxe et s챕mantique que les motifs utilis챕s pour fnmatch(3) sans le drapeau FNM_PATHNAME, sauf qu'un nom de chemin correspond aussi 횪 un motif si la suppression de n'importe quel nombre de composants finaux du nom de chemin correspond au motif. Par exemple, le motif \"`foo*bar`\" correspond 횪 \"`fooasdfbar`\" et \"`foo/bar/baz/asdf`\" mais pas 횪 \"`foobarx`\"."
 
 #. type: Labeled list
-#: en/diff-options.txt:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, no-wrap, priority:280
 msgid "--skip-to=<file>"
 msgstr "--skip-to=<fichier>"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, no-wrap, priority:280
 msgid "--rotate-to=<file>"
 msgstr "--rotate-to=<fichier>"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr "Supprimer les noms des fichiers avant <fichier> dans la sortie (c'est-횪-dire \"skip to\"), ou les d챕placer 횪 la fin de la sortie (c'est-횪-dire \"rotate to\").  Ces options servent principalement lors de la commande `git difftool`, et peuvent ne pas 챗tre tr챔s utiles ailleurs."
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr "-R"
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, priority:280
 msgid "Swap two inputs; that is, show differences from index or on-disk file to tree contents."
 msgstr "횋changer deux entr챕es혻; c'est-횪-dire afficher les diff챕rences depuis l'index ou avec un fichier sur disque avec le contenu de l'arbre."
 
 #. type: Labeled list
-#: en/diff-options.txt:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr "--relative[=<chemin>]"
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr "Lorsque lanc챕 depuis un sous-r챕pertoire du projet, il peut lui 챗tre indiqu챕 d'exclure les modifications hors du r챕pertoire et d'afficher les noms de chemins relativement 횪 lui avec cette option. Quand vous n'챗tes pas dans un sous-r챕pertoire (par ex. dans un d챕p척t nu), vous pouvez nommer quel sous-r챕pertoire par rapport auquel afficher la sortie en fournissant un argument <chemin>. L'option `--no-relative` peut 챗tre utilis챕e pour annuler l'option de configuration `diff.relative` et l'option `--relative` pr챕c챕dente."
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr "Traiter tous les fichiers comme texte."
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr "Ignorer les retours chariot en fin de ligne lors de la comparaison."
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr "Ignorer les blancs lors de la comparaison de lignes. Ceci ignore les diff챕rences m챗me si une ligne contient des espaces alors que l'autre n'en a pas."
 
 #. type: Labeled list
-#: en/diff-options.txt:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr "Ignorer les modifications dont les lignes sont blanches."
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr "-I<regex>"
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, no-wrap, priority:280
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-matching-lines=<regex>"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr "Ignorer les modifications dont toutes les lignes correspondent 횪 <regex>.  Cette option peut 챗tre sp챕cifi챕e plusieurs fois."
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr "--inter-hunk-context=<lignes>"
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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 "Afficher le contexte entre des sections de diff, jusqu'au nombre sp챕cifi챕 de lignes, fusionnant de ce fait les sections qui sont proches. Par d챕faut, `diff.interHunkContext` ou 0 si l'option de configuration n'est pas configur챕e."
 
 #. type: Labeled list
-#: en/diff-options.txt:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr "-W"
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr "Afficher l�셞nsemble de la fonction comme lignes de contexte pour chaque modification.  Les noms de fonction sont d챕termin챕s de la m챗me mani챔re que 'git diff' g챕n챔re sur les en-t챗tes de sections de rustines(voir 'D챕finir un en-t챗te personnalis챕' dans linkgit:gitattributes[5])."
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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 "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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr "D챕sactiver toute sortie du programme. Implique `--exit-code`."
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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 "Permettre l'ex챕cution d'un assistant externe de diff챕rence. Si vous d챕finissez un pilote externe de diff챕rence avec linkgit:gitattributes[5], vous avez besoin d'utiliser cette option avec linkgit:git-log[1] et compagnie."
 
 #. type: Labeled list
-#: en/diff-options.txt:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr "D챕sactiver les pilotes de diff externes."
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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 "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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr "--ignore-submodules[=<quand>]"
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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 "Ignorer les modifications 횪 des sous-modules lors de la g챕n챕ration du diff. <quand> peut valoir \"none\" (aucun), \"untracked\" (non-suivi), \"dirty\" (sale) ou \"all\" (tout) qui est la valeur par d챕faut. L'utilisation de \"none\" va consid챕rer comme modifi챕s les sous-modules quand ils contiennent soit des fichiers non-suivis ou modifi챕s, ou si sa HEAD diff챔re du commit enregistr챕 dans le super-projet, et peut 챗tre utilis챕 pour passer outre tout r챕glage de l'option 'ignore' dans linkgit:git-config[1] ou linkgit:gitmodules[5]. Quand \"untracked\" est utilis챕, les sous-modules ne sont pas consid챕r챕s sales quand ils ne contiennent que du contenu non suivi (mais ils sont quand m챗me scann챕s pour trouver du contenu modifi챕). L'utilisation de \"dirty\" ignore toutes les modifications 횪 l'arbre de travail des sous-modules혻; seules les modifications aux commits stock챕s dans le super-projet sont affich챕es (c'챕tait le comportement jusqu'횪 1.7.0). La valeur \"all\" cache toutes les modifications des sous-modules."
 
 #. type: Labeled list
-#: en/diff-options.txt:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr "--src-prefix=<pr챕fixe>"
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr "Afficher le pr챕fixe de source fourni au lieu de \"a/\"."
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr "--dst-prefix=<pr챕fixe>"
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr "Afficher le pr챕fixe de destination fourni au lieu de \"b/\"."
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr "N'afficher aucun pr챕fixe ni de source, ni de destination."
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr "--line-prefix=<pr챕fixe>"
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr "Pr챕fixer avec une cha챤ne additionnelle chaque ligne de la sortie."
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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 "Par d챕faut, une entr챕e ajout챕e par \"git add -N\" appara챤t comme un fichier vide existant dans \"git diff\" et un nouveau fichier dans \"git diff --cached\". Cette option fait appara챤tre l'entr챕e comme un fichier nouveau dans \"git diff\" et non existant dans \"git diff --cached\". Cette option peut 챗tre invers챕e avec `--ita-visible-in-index`. Les deux options sont exp챕rimentales et peuvent 챗tre retir챕es dans le futur."
 
 #. type: Plain text
-#: en/diff-options.txt:846
+#: en/diff-options.txt:852
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5862,55 +5878,74 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr "L'argument de cette option peut 챗tre un glob sur les noms de r챕f챕rence, une r챕f챕rence ou le SHA-1 (챕ventuellement abr챕g챕) d'un commit. La sp챕cification d'un glob 챕quivaut 횪 sp챕cifier cette option plusieurs fois, une pour chaque nom de r챕f챕rence correspondant."
 
 #. type: Plain text
-#: en/fetch-options.txt:67
-#, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+#: en/fetch-options.txt:68
+#, fuzzy, priority:220
+#| msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr "Voir aussi la variable de configuration `fetch.negotiationAlgorithm` document챕e dans linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr "Montrer ce qui serait fait, sans faire de changements."
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr "Ecrire la liste des refs distants r챕cup챕r챕s dans le fichier `FETCH_HEAD` directement sous `$GIT_DIR`.  C'est la valeur par d챕faut.  Passer `--no-write-fetch-head` depuis la ligne de commande indique 횪 Git de ne pas 챕crire le fichier.  Avec l'option `--dry-run`, le fichier n'est jamais 챕crit."
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr "Lorsque 'git fetch' est utilis챕 avec la sp챕cification de r챕f챕rence `<src>:<dst>`, il peut refuser de mettre 횪 jour la branche locale comme cela a 챕t챕 discut챕"
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5920,397 +5955,397 @@ msgstr ""
 "\tlinkgit:git-fetch[1].\n"
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr "\tdans la partie `<sp챕cificateur-de-r챕f챕rence>` ci-dessous.\n"
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr "\tCette option permet de passer outre 횪 ce contr척le.\n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr "Conserver le paquet t챕l챕charg챕."
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr "Permettre de sp챕cifier plusieurs arguments <d챕p척t> et <groupe>. Aucun <sp챕cificateur-de-r챕f챕rence> ne peut 챗tre sp챕cifi챕."
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr "Ex챕cuter `git maintenance --auto` 횪 la fin pour effectuer la maintenance automatique du d챕p척t si n챕cessaire. (`--[no-]auto-gc` est un synonym.) Ceci est activ챕 par d챕faut."
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr "횋crire un graphe de commit apr챔s avoir r챕cup챕r챕. Ceci remplace le param챔tre de configuration `fetch.writeCommitGraph`."
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr "Modifier le sp챕cificateur de r챕f챕rence configur챕 pour placer toutes les refs dans l'espace de noms `refs/prefetch/`. Voir la t창che `prefetch` dans linkgit:git-maintenance[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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 "Avant de r챕cup챕rer, supprimer toutes les r챕f챕rences de suivi 횪 distance qui n'existent plus sur le d챕p척t distant.  Les 챕tiquettes ne sont pas sujettes 횪 l'챕lagage si elles ne sont r챕cup챕r챕es qu'en raison du suivi automatique de l'챕tiquette par d챕faut ou en raison d'une option --tags.  Cependant, si les 챕tiquettes sont r챕cup챕r챕es en raison d'un sp챕cificateur de r챕f챕rence explicite (soit en ligne de commande, soit dans la configuration distante, par exemple si le d챕p척t distant a 챕t챕 clon챕 avec l'option --mirror), alors elles sont 챕galement sujettes 횪 l'챕lagage. La fourniture de `--prune-tags` est une abr챕viation pour la fourniture du sp챕cificateur de r챕f챕rence d'챕tiquette."
 
 #. type: Plain text
-#: en/fetch-options.txt:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr "Voir la section 횋LAGAGE ci-dessous pour plus de d챕tails."
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr "-P"
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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 "Avant de r챕cup챕rer, supprimer toutes les 챕tiquettes locales qui n'existent plus sur le distant si `--prune` est activ챕. Cette option doit 챗tre utilis챕e avec plus de pr챕caution, car contrairement 횪 `--prune`, elle supprime toutes les r챕f챕rences locales (챕tiquettes locales) qui ont 챕t챕 cr챕챕es. Cette option est un raccourci pour la fourniture du sp챕cificateur de r챕f챕rence d'챕tiquette explicite avec `--prune`, voir la discussion 횪 ce sujet dans sa documentation."
 
 #. type: Labeled list
-#: en/fetch-options.txt:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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 "Par d챕faut, les 챕tiquettes qui pointent sur des objets t챕l챕charg챕s 횪 partir du d챕p척t distant sont r챕cup챕r챕es et stock챕es localement.  Cette option d챕sactive le suivi automatique des 챕tiquettes. Le comportement par d챕faut d'un distant peut 챗tre sp챕cifi챕 avec le param챔tre remote.<nom>.tagOpt. Voir linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr "--refmap=<sp챕cificateur-de-r챕f챕rence>"
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr "Lors de la r챕cup챕ration des r챕f챕rences list챕es en ligne de commande, utiliser la sp챕cification de r챕f챕rence (qui peut 챗tre donn챕e plusieurs fois) pour mapper les r챕f챕rences sur les branches de suivi 횪 distance, au lieu des valeurs des variables de configuration `remote.*.fetch` pour le d챕p척t distant.  Fournir un `<sp챕cificateur-de-r챕f챕rence>` vide 횪 l'option `--refmap` fait que Git ignore les sp챕cification de r챕f챕rence configur챕es et se fie enti챔rement aux sp챕cifications de r챕f챕rence fournies comme arguments de la ligne de commande. Voir la section sur les \"Branches de suivi 횪 distance configur챕es\" pour plus de d챕tails."
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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 "R챕cup챕rer toutes les 챕tiquettes 횪 distance (c'est-횪-dire, r챕cup챕rer les 챕tiquettes `refs/tags/*` dans les 챕tiquettes locales avec le m챗me nom), en plus de tout ce qui serait r챕cup챕r챕 autrement.  L'utilisation de cette seule option ne soumet pas les 챕tiquettes 횪 un 챕lagage, m챗me si --prune est utilis챕 (bien que les 챕tiquettes puissent 챗tre 챕lagu챕es de toute fa챌on si elles sont aussi la destination d'une sp챕cification de r챕f챕rence explicite ; voir `--prune`)."
 
 #. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr "--recurse-submodules[=yes|on-demand|no]"
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr "Cette option permet de contr척ler si et dans quelles conditions les nouveaux engagements de sous-modules peupl챕s doivent 챕galement 챗tre r챕cup챕r챕s. Elle peut 챗tre utilis챕e comme une option bool챕enne pour d챕sactiver compl챔tement la r챕cursivit챕 lorsqu'elle est d챕finie sur 'no' ou pour visiter r챕cursivement sans condition tous les sous-modules peupl챕s lorsqu'elle est d챕finie sur 'yes', qui est la valeur par d챕faut lorsque cette option est utilis챕e sans aucune valeur. Utiliser 'on-demand' pour ne visiter r챕cursivement un sous-module peupl챕 que lorsque le superprojet r챕cup챔re un commit qui met 횪 jour la r챕f챕rence du sous-module 횪 un commit qui n'est pas d챕j횪 dans le clone local du sous-module. Par d챕faut, 'on-demand' est utilis챕 횪 moins que `fetch.recurseSubmodules` ne soit param챕tr챕 (voir linkgit:git-config[1])."
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr "--jobs=<n>"
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr "Nombre d'enfants parall챔les 횪 utiliser pour toutes les formes d'extraction."
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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 "Si l'option `--multiple` a 챕t챕 sp챕cifi챕e, les diff챕rents distants seront r챕cup챕r챕s en parall챔le. Si plusieurs sous-modules sont r챕cup챕r챕s, ils seront r챕cup챕r챕s en parall챔le. Pour les contr척ler ind챕pendamment, utilisez les param챔tres de configuration `fetch.parallel` et `submodule.fetchJobs` (voir linkgit:git-config[1])."
 
 #. type: Plain text
-#: en/fetch-options.txt:201
+#: en/fetch-options.txt:210
 #, priority:220
 msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
 msgstr "G챕n챕ralement, les recherches r챕cursives parall챔les et sur des distants multiples seront plus rapides. Par d챕faut, les recherches sont effectu챕es de mani챔re s챕quentielle, et non en parall챔le."
 
 #. type: Labeled list
-#: en/fetch-options.txt:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, priority:220
 msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
 msgstr "D챕sactiver la r챕cup챕ration r챕cursive des sous-modules (cela a le m챗me effet que d'utiliser l'option `--recurse-submodules=no`)."
 
 #. type: Labeled list
-#: en/fetch-options.txt:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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 "Si le distant est r챕cup챕r챕 avec succ챔s, ajouter la r챕f챕rence (de suivi) amont , utilis챕e par les commandes sans argument linkgit:git-pull[1] et autres. Pour plus d'informations, voir `branch.<nom>.merge` et `branch.<nom>.remote` dans linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr "--submodule-prefix=<chemin>"
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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 "Pr챕fixer <chemin> aux chemins affich챕s dans les messages informatifs tels que \"R챕cup챕ration du sous-module foo\".  Cette option est utilis챕e en interne lors de la r챕cursion sur les sous-modules."
 
 #. type: Labeled list
-#: en/fetch-options.txt:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr "--recurse-submodules-default=[yes|on-demand]"
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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 "Cette option est utilis챕e en interne pour fournir temporairement une valeur par d챕faut non n챕gative pour l'option --recurse-submodules.  Toutes les autres m챕thodes de configuration de la r챕cup챕ration r챕cursive des sous-module (comme les param챔tres de linkgit:gitmodules[5] et linkgit:git-config[1]) remplacent cette option, tout comme le fait de sp챕cifier directement --[no-]recurse-submodules."
 
 #. type: Labeled list
-#: en/fetch-options.txt:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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 "Par d챕faut, 'git fetch' refuse de mettre 횪 jour la t챗te qui correspond 횪 la branche en cours.  Ce drapeau d챕sactive la v챕rification.  C'est purement pour l'usage interne de 'git pull' pour communiquer avec 'git fetch', et 횪 moins que vous n'impl챕mentiez votre propre Porcelaine, vous n'챗tes pas cens챕 l'utiliser."
 
 #. type: Labeled list
-#: en/fetch-options.txt:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr "--upload-pack <upload-pack>"
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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 "Lorsqu'il est donn챕, et que le d챕p척t 횪 r챕cup챕rer est g챕r챕 par 'git fetch-pack', `--exec=<upload-pack>` est pass챕 횪 la commande pour sp챕cifier le chemin par d챕faut pour la commande ex챕cut챕e 횪 l'autre bout."
 
 #. type: Labeled list
-#: en/fetch-options.txt:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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 "Passer -- quiet pour git-fetch-pack et faire taire toute autre commande git utilis챕e en interne. La progression n'est pas signal챕e dans le flux d'erreurs standard."
 
 #. type: Labeled list
-#: en/fetch-options.txt:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "Mode bavard."
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr "-o <option>"
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<option>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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 "Par d챕faut, git v챕rifie si une branche est mise 횪 jour de force pendant la r챕cup챕ration. Cela peut 챗tre d챕sactiv챕 via fetch.showForcedUpdates, mais l'option --show-forced-updates garantit que cette v챕rification a lieu.  Voir linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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 "Par d챕faut, git v챕rifie si une branche est mise 횪 jour de force pendant la r챕cup챕ration. Passer --no-show-forced-updates ou r챕gler fetch.showForcedUpdates 횪 false pour sauter cette v챕rification pour des raisons de performance. Si elle est utilis챕e pendant 'git-pull', l'option --ff-only v챕rifiera toujours les mises 횪 jour forc챕es avant de tenter une mise 횪 jour rapide. Voir linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr "Utiliser uniquement les adresses IPv4, en ignorant les adresses IPv6."
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr "Utiliser uniquement les adresses IPv6, en ignorant les adresses IPv4."
@@ -6398,13 +6433,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:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OPTIONS"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr "<sp챕cificateur de chemin>..."
@@ -6434,7 +6469,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr "Permettre l'ajout de fichiers qui sont normalement ignor챕s."
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6464,13 +6499,13 @@ 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6644,31 +6679,31 @@ 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:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<fichier>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr "Le sp챕cificateur de chemin est pass챕 dans `<fichier>` au lieu des arguments de la ligne de commande. Si `<fichier>` vaut `-` alors l'entr챕e standard est utilis챕e. Les 챕l챕ments du sp챕cificateur de chemin sont s챕par챕s par LF ou CR/LF. Les 챕l챕ments du sp챕cificateur de chemin peuvent 챗tre cit챕s comme expliqu챕 pour la variable de configuration `core.quotePath` (voir linkgit:git-config[1]). Voir aussi l'option `--pathspec-file-nul` et l'option globale `--literal-pathspecs`."
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr "Uniquement significatif avec `--pathspec-from-file`. Les 챕l챕ments du sp챕cificateur de chemin sont s챕par챕s par le caract챔re NUL et tous les autres caract챔res sont utilis챕s litt챕ralement (y compris les retours 횪 la ligne et les guillemets)."
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr "\\--"
@@ -6680,7 +6715,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:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "EXEMPLES"
@@ -7058,7 +7093,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:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
@@ -7070,13 +7105,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "Fait partie de la suite linkgit:git[1]"
@@ -7106,7 +7141,16 @@ msgid ""
 "\t [--quoted-cr=<action>]\n"
 "\t [(<mbox> | <Maildir>)...]\n"
 "'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
-msgstr "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n\t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<r챕pertoire>]\n\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n\t [--[no-]scissors] [-S[<idcl챕>]] [--patch-format=<format>]\n\t [--quoted-cr=<action>]\n\t [(<mbox> | <Maildir>)...]\n'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
+msgstr ""
+"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
+"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
+"\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n"
+"\t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<r챕pertoire>]\n"
+"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
+"\t [--[no-]scissors] [-S[<idcl챕>]] [--patch-format=<format>]\n"
+"\t [--quoted-cr=<action>]\n"
+"\t [(<mbox> | <Maildir>)...]\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
 
 #. type: Plain text
 #: en/git-am.txt:27
@@ -7515,7 +7559,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr "Montrer le message auquel `git am` s'est arr챗t챕 en raison de conflits.  Si `raw` est sp챕cifi챕, afficher le contenu brut du message 챕lectronique ; si `diff`, afficher uniquement la partie diff.  La valeur par d챕faut est `raw`."
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr "DISCUSSION"
@@ -7735,7 +7779,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr "Au lieu d'appliquer la rustine, voir si la rustine est applicable 횪 l'arbre de travail actuel et/ou au fichier d'index et d챕tecte les erreurs.  D챕sactive \"apply\"."
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -8035,7 +8079,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr "Lorsque `git apply` est utilis챕 comme 짬혻meilleur patch GNU혻쨩, l'utilisateur peut passer l'option `--unsafe-paths` pour passer outre cette v챕rification de s챕curit챕.  Cette option n'a aucun effet lorsque `--index` ou `--cached` est utilis챕."
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr "CONFIGURATION"
@@ -8311,7 +8355,7 @@ msgid "Format of the resulting archive: 'tar' or 'zip'. If this option is not gi
 msgstr "Format de l'archive r챕sultante : 'tar' ou 'zip'. Si cette option n'est pas donn챕e, et que le fichier de sortie est sp챕cifi챕, le format est d챕duit du nom du fichier si possible (par exemple, en 챕crivant \"foo.zip\", la sortie sera au format zip). Sinon, le format de sortie est `tar`."
 
 #. type: Labeled list
-#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8449,7 +8493,7 @@ msgid "zip"
 msgstr "zip"
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -11307,7 +11351,12 @@ msgid ""
 "\tdir/link: a symlink to ../f\n"
 "\tplink: a symlink to ../f\n"
 "\talink: a symlink to /etc/passwd\n"
-msgstr "\tf : un fichier contenant \"hello\\n\".\n\tlink : un lien symbolique vers f\n\tdir/link : un lien symbolique vers ../f\n\tplink : un lien symbolique vers ../f\n\talink : un lien symbolique vers /etc/passwd\n"
+msgstr ""
+"\tf : un fichier contenant \"hello\\n\".\n"
+"\tlink : un lien symbolique vers f\n"
+"\tdir/link : un lien symbolique vers ../f\n"
+"\tplink : un lien symbolique vers ../f\n"
+"\talink : un lien symbolique vers /etc/passwd\n"
 
 #. type: Plain text
 #: en/git-cat-file.txt:148
@@ -11351,7 +11400,9 @@ msgstr "Les deux `plink` et` alink` pointent en dehors de l'arbre, donc ils affi
 msgid ""
 "\tsymlink 4\n"
 "\t../f\n"
-msgstr "\tsymlink 4\n\t../f\n"
+msgstr ""
+"\tsymlink 4\n"
+"\t../f\n"
 
 #. type: Plain text
 #: en/git-cat-file.txt:173
@@ -11359,7 +11410,9 @@ msgstr "\tsymlink 4\n\t../f\n"
 msgid ""
 "\tsymlink 11\n"
 "\t/etc/passwd\n"
-msgstr "\tsymlink 11\n\t/etc/passwd\n"
+msgstr ""
+"\tsymlink 11\n"
+"\t/etc/passwd\n"
 
 #. type: Title -
 #: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:194 en/git-ls-files.txt:198 en/git-push.txt:433 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
@@ -11511,7 +11564,9 @@ msgstr "Par exemple, `--batch` sans un format personnalis챕 produirait :"
 msgid ""
 "<oid> SP <type> SP <size> LF\n"
 "<contents> LF\n"
-msgstr "<oid> SP <type> SP <taille> LF\n<contenu> LF\n"
+msgstr ""
+"<oid> SP <type> SP <taille> LF\n"
+"<contenu> LF\n"
 
 #. type: Plain text
 #: en/git-cat-file.txt:244
@@ -11561,7 +11616,9 @@ msgstr "Si `--follow-symlinks` est utilis챕, et qu'un lien symbolique dans le d
 msgid ""
 "symlink SP <size> LF\n"
 "<symlink> LF\n"
-msgstr "symlink SP <taille> LF\n<lien-symbolique> LF\n"
+msgstr ""
+"symlink SP <taille> LF\n"
+"<lien-symbolique> LF\n"
 
 #. type: Plain text
 #: en/git-cat-file.txt:274
@@ -11587,7 +11644,9 @@ msgstr "est imprim챕 lorsque le lien symbolique initial demand챕 n'existe pas."
 msgid ""
 "dangling SP <size> LF\n"
 "<object> LF\n"
-msgstr "dangling SP <taille> LF\n<objet> LF\n"
+msgstr ""
+"dangling SP <taille> LF\n"
+"<objet> LF\n"
 
 #. type: Plain text
 #: en/git-cat-file.txt:289
@@ -11601,7 +11660,9 @@ msgstr "est affich챕 lorsque le lien symbolique initial existe, mais que ce vers
 msgid ""
 "loop SP <size> LF\n"
 "<object> LF\n"
-msgstr "loop SP <taille> LF\n<objet> LF\n"
+msgstr ""
+"loop SP <taille> LF\n"
+"<objet> LF\n"
 
 #. type: Plain text
 #: en/git-cat-file.txt:296
@@ -11615,7 +11676,9 @@ msgstr "est affich챕 pour les boucles de liens symboliques (ou tous les liens sy
 msgid ""
 "notdir SP <size> LF\n"
 "<object> LF\n"
-msgstr "notdir SP <taille> LF\n<objet> LF\n"
+msgstr ""
+"notdir SP <taille> LF\n"
+"<objet> LF\n"
 
 #. type: Plain text
 #: en/git-cat-file.txt:303
@@ -11659,7 +11722,9 @@ msgstr "git-check-attr - Affiche les informations gitattributes"
 msgid ""
 "'git check-attr' [-a | --all | <attr>...] [--] <pathname>...\n"
 "'git check-attr' --stdin [-z] [-a | --all | <attr>...]\n"
-msgstr "'git check-attr' [-a | --all | <attr>...] [--] <nom-de-chemin>...\n'git check-attr' --stdin [-z] [-a | --all | <attr>...]\n"
+msgstr ""
+"'git check-attr' [-a | --all | <attr>...] [--] <nom-de-chemin>...\n"
+"'git check-attr' --stdin [-z] [-a | --all | <attr>...]\n"
 
 #. type: Plain text
 #: en/git-check-attr.txt:19
@@ -11800,7 +11865,10 @@ msgid ""
 "*.java diff=java -crlf myAttr\n"
 "NoMyAttr.java !myAttr\n"
 "README caveat=unspecified\n"
-msgstr "*.java diff=java -crlf myAttr\nNoMyAttr.java !myAttr\nREADME caveat=unspecified\n"
+msgstr ""
+"*.java diff=java -crlf myAttr\n"
+"NoMyAttr.java !myAttr\n"
+"README caveat=unspecified\n"
 
 #. type: Plain text
 #: en/git-check-attr.txt:81
@@ -11814,7 +11882,9 @@ msgstr "Lister un seul attribut :"
 msgid ""
 "$ git check-attr diff org/example/MyClass.java\n"
 "org/example/MyClass.java: diff: java\n"
-msgstr "$ git check-attr diff org/example/MyClass.java\norg/example/MyClass.java: diff: java\n"
+msgstr ""
+"$ git check-attr diff org/example/MyClass.java\n"
+"org/example/MyClass.java: diff: java\n"
 
 #. type: Plain text
 #: en/git-check-attr.txt:87
@@ -11830,7 +11900,11 @@ msgid ""
 "org/example/MyClass.java: crlf: unset\n"
 "org/example/MyClass.java: diff: java\n"
 "org/example/MyClass.java: myAttr: set\n"
-msgstr "$ git check-attr crlf diff myAttr -- org/example/MyClass.java\norg/example/MyClass.java: crlf: unset\norg/example/MyClass.java: diff: java\norg/example/MyClass.java: myAttr: set\n"
+msgstr ""
+"$ git check-attr crlf diff myAttr -- org/example/MyClass.java\n"
+"org/example/MyClass.java: crlf: unset\n"
+"org/example/MyClass.java: diff: java\n"
+"org/example/MyClass.java: myAttr: set\n"
 
 #. type: Plain text
 #: en/git-check-attr.txt:95
@@ -11845,7 +11919,10 @@ msgid ""
 "$ git check-attr --all -- org/example/MyClass.java\n"
 "org/example/MyClass.java: diff: java\n"
 "org/example/MyClass.java: myAttr: set\n"
-msgstr "$ git check-attr --all -- org/example/MyClass.java\norg/example/MyClass.java: diff: java\norg/example/MyClass.java: myAttr: set\n"
+msgstr ""
+"$ git check-attr --all -- org/example/MyClass.java\n"
+"org/example/MyClass.java: diff: java\n"
+"org/example/MyClass.java: myAttr: set\n"
 
 #. type: Plain text
 #: en/git-check-attr.txt:102
@@ -11860,7 +11937,10 @@ msgid ""
 "$ git check-attr myAttr -- org/example/MyClass.java org/example/NoMyAttr.java\n"
 "org/example/MyClass.java: myAttr: set\n"
 "org/example/NoMyAttr.java: myAttr: unspecified\n"
-msgstr "$ git check-attr myAttr -- org/example/MyClass.java org/example/NoMyAttr.java\norg/example/MyClass.java: myAttr: set\norg/example/NoMyAttr.java: myAttr: unspecified\n"
+msgstr ""
+"$ git check-attr myAttr -- org/example/MyClass.java org/example/NoMyAttr.java\n"
+"org/example/MyClass.java: myAttr: set\n"
+"org/example/NoMyAttr.java: myAttr: unspecified\n"
 
 #. type: Plain text
 #: en/git-check-attr.txt:109
@@ -11874,7 +11954,9 @@ msgstr "Toutes les valeurs ne sont pas 챕galement univoques :"
 msgid ""
 "$ git check-attr caveat README\n"
 "README: caveat: unspecified\n"
-msgstr "$ git check-attr caveat README\nREADME: caveat: unspecified\n"
+msgstr ""
+"$ git check-attr caveat README\n"
+"README: caveat: unspecified\n"
 
 #. type: Plain text
 #: en/git-check-attr.txt:117
@@ -11900,7 +11982,9 @@ msgstr "git-check-ignore - D챕bogue les fichiers gitignore / exclude"
 msgid ""
 "'git check-ignore' [<options>] <pathname>...\n"
 "'git check-ignore' [<options>] --stdin\n"
-msgstr "'git check-ignore' [<options>] <nom-de-chemin>...\n'git check-ignore' [<options>] --stdin\n"
+msgstr ""
+"'git check-ignore' [<options>] <nom-de-chemin>...\n"
+"'git check-ignore' [<options>] --stdin\n"
 
 #. type: Plain text
 #: en/git-check-ignore.txt:22
@@ -12127,7 +12211,12 @@ msgid ""
 "\t\t   [--temp]\n"
 "\t\t   [-z] [--stdin]\n"
 "\t\t   [--] [<file>...]\n"
-msgstr "git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<chaine>]\n\t\t   [--stage=<num챕ro>|all]\n\t\t   [--temp]\n\t\t   [-z] [--stdin]\n\t\t   [--] [<fichier>...]\n"
+msgstr ""
+"git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<chaine>]\n"
+"\t\t   [--stage=<num챕ro>|all]\n"
+"\t\t   [--temp]\n"
+"\t\t   [-z] [--stdin]\n"
+"\t\t   [--] [<fichier>...]\n"
 
 #. type: Plain text
 #: en/git-checkout-index.txt:22
@@ -12550,7 +12639,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr "C'est similaire au mode pr챕c챕dent, mais vous laisse utiliser l'interface interactive pour afficher la sortie 짬혻diff혻쨩 et choisir quelles sections utiliser dans le r챕sultat. Voir plus bas la description de l'option `--patch`."
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr "Silencieux, supprimer les messages d'챕tat."
@@ -12934,7 +13023,7 @@ msgid "Limits the paths affected by the operation."
 msgstr "Limite les chemins affect챕s par l'op챕ration."
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr "Pour plus de d챕tail, voir l'entr챕e 'sp챕cificateur de chemin' dans linkgit:gitglossary[7]."
@@ -14406,7 +14495,16 @@ msgid ""
 "\t  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
 "\t  [--filter=<filter>] [--] <repository>\n"
 "\t  [<directory>]\n"
-msgstr "'git clone' [--template=<r챕pertoire_de_mod챔les>]\n\t  [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n\t  [-o <nom>] [-b <nom>] [-u <upload-pack>] [--reference <d챕p척t>]\n\t  [--dissociate] [--separate-git-dir <r챕pertoire git>]\n\t  [--depth <profondeur>] [--[no-]single-branch] [--no-tags]\n\t  [--recurse-submodules[=<sp챕c.de chemin>]] [--[no-]shallow-submodules]\n\t  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n\t  [--filter=<filter>] [--] <d챕p척t>\n\t  [<r챕pertoire>]\n"
+msgstr ""
+"'git clone' [--template=<r챕pertoire_de_mod챔les>]\n"
+"\t  [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
+"\t  [-o <nom>] [-b <nom>] [-u <upload-pack>] [--reference <d챕p척t>]\n"
+"\t  [--dissociate] [--separate-git-dir <r챕pertoire git>]\n"
+"\t  [--depth <profondeur>] [--[no-]single-branch] [--no-tags]\n"
+"\t  [--recurse-submodules[=<sp챕c.de chemin>]] [--[no-]shallow-submodules]\n"
+"\t  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
+"\t  [--filter=<filter>] [--] <d챕p척t>\n"
+"\t  [<r챕pertoire>]\n"
 
 #. type: Plain text
 #: en/git-clone.txt:30
@@ -14427,7 +14525,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr "Cette configuration par d챕faut est r챕alis챕e en cr챕ant des r챕f챕rences aux sommets des branches distantes sous `refs/remotes/origin` et en initialisant les variables de configuration `remote.origin.url` et `remote.origin.fetch`."
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -15243,7 +15341,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr "FICHIERS"
@@ -15284,7 +15382,15 @@ msgid ""
 "\t   [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "\t   [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n"
 "\t   [--] [<pathspec>...]\n"
-msgstr "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n\t   [--dry-run] [(-c | -C | -squash) <commit>] | --fixup [(amend|reword):]<commit>)]\n\t   [-F <fichier> | -m <msg>] [--reset-author] [--allow-empty]\n\t   [--allow-empty-message] [--no-verify] [-e] [--author=<auteur>]\n\t   [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n\t   [-i | -o] [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n\t   [(--trailer <token>[(=|:)<valeur>])...] [-S[<idcl챕>]] \n\t[--] [<spec-de-chemin>...]\n"
+msgstr ""
+"'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
+"\t   [--dry-run] [(-c | -C | -squash) <commit>] | --fixup [(amend|reword):]<commit>)]\n"
+"\t   [-F <fichier> | -m <msg>] [--reset-author] [--allow-empty]\n"
+"\t   [--allow-empty-message] [--no-verify] [-e] [--author=<auteur>]\n"
+"\t   [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n"
+"\t   [-i | -o] [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
+"\t   [(--trailer <token>[(=|:)<valeur>])...] [-S[<idcl챕>]] \n"
+"\t[--] [<spec-de-chemin>...]\n"
 
 #. type: Plain text
 #: en/git-commit.txt:28
@@ -15348,8 +15454,9 @@ msgstr "Indiquer 횪 la commande d'indexer automatiquement les fichiers qui ont 
 
 #. type: Plain text
 #: en/git-commit.txt:78
-#, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+#, fuzzy, priority:280
+#| msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr "Utiliser la s챕lection interactive de correctif pour choisir quelles modifications valider. R챕f챕rez-vous 횪 linkgit:git-add[1] pour plus de d챕tails."
 
 #. type: Labeled list
@@ -15479,7 +15586,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr "Seulement avec '--dry-run', donner la sortie en format compatible porcelaine. Voir linkgit:git-status[1] pour plus de d챕tails."
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15491,7 +15598,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr "Avec '--dry-run', donner la sortie en format long. Implique `--dry-run`."
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -16226,557 +16333,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
+#, priority:100
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr "Supprimer la section indiqu챕e du fichier de configuration."
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr "--default <valeur>"
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr "~/.gitconfig"
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr "Fichier de configuration sp챕cifique au d챕p척t."
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr "ENVIRONNEMENT"
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16837,14 +16938,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16855,7 +16968,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16869,7 +16982,7 @@ msgstr ""
 "\tfilemode = false\n"
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16879,7 +16992,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16889,7 +17002,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16901,157 +17014,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -17061,13 +17174,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -17080,19 +17193,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr "BOGUES"
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -17100,13 +17213,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19745,103 +19858,104 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr "Au lieu de trouver l'챕tiquette ant챕rieure au commit, trouver l'챕tiquette qui vient apr챔s le commit, et la contient ainsi.  Implique automatiquement --tags."
 
 #. type: Plain text
-#: en/git-describe.txt:70
-#, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+#: en/git-describe.txt:71
+#, fuzzy, priority:260
+#| msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr "Au lieu d'utiliser les 7 chiffres hexad챕cimaux par d챕faut comme nom d'objet abr챕g챕, utiliser <n> chiffres, ou autant de chiffres que n챕cessaire pour former un nom unique.  Un <n> de 0 supprimera le format long, n'affichant que l'챕tiquette la plus proche."
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr "--candidates=<n>"
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr "Au lieu de consid챕rer seulement les 10 챕tiquettes les plus r챕centes comme des candidates pour d챕crire l'entr챕e commit-esque, consid챕rer jusqu'횪 <n> candidates.  Augmenter <n> au-dessus de 10 prendra un peu plus de temps mais peut produire un r챕sultat plus pr챕cis.  Un <n> de 0 n'entra챤nera l'affichage que des correspondances exactes."
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr "Affiche uniquement les correspondances exactes (une 챕tiquette fait directement r챕f챕rence au commit fourni). Ceci est un synonyme de --candidates=0."
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr "Affiche  de nombreuses informations sur la strat챕gie de recherche utilis챕e sur la sortie d'erreur. Le nom de l'챕tiquette sera toujours affich챕 sur la sortie standard."
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 "Afficher toujours le format long (l'챕tiquette, le nombre de commits et le nom de validation abr챕g챕) m챗me lorsqu'il correspond 횪 une 챕tiquette.  Ceci est utile lorsque vous souhaitez voir des parties du nom d'objet commit dans la sortie de 짬 describe 쨩, m챗me lorsque le commit en question se trouve 챗tre une version 챕tiquet챕e.  Au lieu de simplement 챕mettre le nom de l'챕tiquette, il d챕crira un tel commit comme v1.2-0-gdeadbee (0챔me commit depuis l'챕tiquette v1.2 qui pointe sur l'objet deadbee....)."
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr "--match <motif>"
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr "Ne consid챕rez que les 챕tiquettes correspondant au motif `glob(7)' donn챕, en excluant le pr챕fixe \"refs/tags/\". Si utilis챕 avec `--all', prendre 챕galement en compte les branches locales et les r챕f챕rences de suivi 횪 distance correspondant au motif, en excluant respectivement les pr챕fixes \"refs/heads/\" et \"refs/remotes/\" ; les r챕f챕rences d'autres types ne sont jamais consid챕r챕es. Si donn챕 plusieurs fois, une liste de motifs sera accumul챕e, et les 챕tiquettes correspondant 횪 l'un des motifs seront prises en compte.  Utiliser `--no-match' pour effacer et r챕initialiser la liste des motifs."
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr "--exclude <motif>"
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr "Ne pas consid챕rer les 챕tiquettes qui correspondent au mod챔le `glob(7)' donn챕, 횪 l'exclusion du pr챕fixe \"refs/tags/\". Si utilis챕 avec `--all', ne pas tenir compte non plus des branches locales et des r챕f챕rences de suivi 횪 distance correspondant au motif, 횪 l'exclusion respectivement des pr챕fixes \"refs/heads/\" et \"refs/remotes/\" ; les r챕f챕rences d'autres types ne sont jamais consid챕r챕es. Si donn챕 plusieurs fois, une liste de motifs sera accumul챕e et les 챕tiquettes correspondant 횪 l'un ou l'autre de ces motifs seront exclues. Si combin챕 avec --match, une 챕tiquette sera prise en compte si elle correspond 횪 au moins un motif --match et ne correspond 횪 aucun des motifs --exclude. Utilisez `--no-exclude' pour effacer et r챕initialiser la liste des motifs."
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr "Afficher les objets commits abr챕g챕s en dernier recours."
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr "Ne suivre que le premier commit parent lors de la rencontre d'un commit de fusion.  Ceci est utile lorsque vous souhaitez ne pas faire correspondre les 챕tiquettes des branches fusionn챕es dans l'historique du commit cible."
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr "Avec quelque chose comme l'arbre actuel git.git, je re챌ois :"
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19851,25 +19965,26 @@ msgstr ""
 "\tv1.0.4-14-g2414721\n"
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr "c'est-횪-dire que la t챗te actuelle de ma branche \"혻m챔re혻\" est bas챕e sur v1.0.4, mais puisqu'elle a quelques commits en plus, describe a ajout챕 le nombre de commits suppl챕mentaires (\"혻14혻\") et un nom abr챕g챕 pour l'objet commit lui-m챗me (\"혻2414721혻\") 횪 la fin."
 
 #. 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\" + 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."
+#: en/git-describe.txt:151
+#, fuzzy, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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 "Le nombre de commits suppl챕mentaires est le nombre de commits qui seraient affich챕s par \"git log v1.0.4..parent\".  Le suffixe de hachage est \"-g\" + abr챕viation unique pour le commit sommet du parent (qui 챕tait `2414721b194453f058079d897d13c4e377f92dc6`).  Le pr챕fixe \"g\" signifie \"git\" et permet de d챕crire la version d'un logiciel en fonction du SCM avec lequel le logiciel est g챕r챕. Ceci est utile dans un environnement o첫 les gens peuvent utiliser diff챕rents SCM."
 
 #. type: Plain text
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr "Faire un 'git describe' sur un nom d'챕tiquette ne fera qu'afficher le nom de l'챕tiquette :"
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19879,13 +19994,13 @@ msgstr ""
 "\tv1.0.4\n"
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr "Avec --all, la commande peut utiliser des t챗tes de branches comme r챕f챕rences, de sorte que la sortie affiche 챕galement le chemin de r챕f챕rence :"
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19895,7 +20010,7 @@ msgstr ""
 "\ttags/v1.0.0-21-g975b\n"
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19905,13 +20020,13 @@ msgstr ""
 "\theads/lt/describe-7-g975b\n"
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr "Avec --abbrev mis 횪 0, la commande peut 챗tre utilis챕e pour trouver le nom de l'챕tiquette la plus proche sans suffixe :"
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19921,37 +20036,37 @@ msgstr ""
 "\ttags/v1.0.0\n"
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr "Notez que le suffixe que vous obtiendrez si vous tapez ces commandes aujourd'hui peut 챗tre plus long que ce que Linus a vu plus haut quand il a lanc챕 ces commandes, car votre d챕p척t Git peut avoir de nouveaux commits dont les noms d'objets commencent par 975b qui n'existaient pas 횪 l'챕poque, et le suffixe \"-g975b\" seul peut ne pas 챗tre suffisant pour d챕sambigu챦ser ces commits."
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr "STRAT횋GIE DE RECHERCHE"
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr "Pour chaque commit-esque fourni,'git describe' cherchera d'abord une 챕tiquette qui marque exactement ce commit.  Les 챕tiquettes annot챕es seront toujours pr챕f챕r챕es aux 챕tiquettes l챕g챔res, et les 챕tiquettes avec des dates plus r챕centes seront toujours pr챕f챕r챕es aux 챕tiquettes avec des dates plus anciennes.  Si une correspondance exacte est trouv챕e, son nom sera affich챕 et la recherche s'arr챗tera."
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr "Si une correspondance exacte n'a pas 챕t챕 trouv챕e,'git describe' reviendra dans l'historique des commits pour localiser un commit anc챗tre qui a 챕t챕 챕tiquet챕.  L'챕tiquette de l'anc챗tre sera affich챕e avec une abr챕viation du SHA1 du commit-esque fourni. Si `--first-parent' a 챕t챕 sp챕cifi챕 alors la marche ne consid챕rera que le premier parent de chaque commit."
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr "Si plusieurs 챕tiquettes ont 챕t챕 trouv챕es pendant la marche, alors l'챕tiquette qui a le moins de commits diff챕rents du commit-esque d'entr챕e sera s챕lectionn챕e et affich챕e.  Ici, le moins de commits diff챕rents est d챕fini comme le nombre de commits qui seraient affich챕s par `git log 챕tiquette..commit-esque' soit le plus petit nombre de commits possible."
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr "Les objets d'arbre ainsi que les objets d'챕tiquette ne pointant pas vers des commits, ne peuvent pas 챗tre d챕crits.  Lors de la description des blobs, les 챕tiquettes l챕g챔res pointant vers les blobs sont ignor챕es, mais le blob est toujours d챕crit comme <commit-esque>: <chemin> bien que l'챕tiquette l챕g챔re soit plus juste."
@@ -19981,19 +20096,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr "Compare les fichiers dans l'arbre de travail et l'index. Quand les chemins sont sp챕cifi챕s, compare seulement ces chemins nomm챕s. Autrement, toutes les entr챕es dans l'index sont compar챕es. Le format de sortie est identique 횪 celle de 'git diff-index' et 'git diff-tree'."
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr "-1 --base"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr "-2 --ours"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr "-3 --theirs"
@@ -20581,7 +20696,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr "<chemin>..."
@@ -20768,15 +20883,17 @@ msgstr "Cette forme sert 횪 visualiser les modifications que vous avez index챕es
 
 #. type: Plain text
 #: en/git-diff.txt:56
-#, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+#, fuzzy, priority:280
+#| msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr "Si --merge-base est donn챕, au lieu d'utiliser <commit>, utiliser la base de fusion de <commit> et HEAD.  `git diff --merge-base A` est 챕quivalent 횪 `git diff $(git merge-base A HEAD)`."
 
 #. type: Labeled list
 #: en/git-diff.txt:57
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
-msgstr "'git diff' [<options>] <commit> [--] [<chemin>...]"
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
+msgstr "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<chemin>...]"
 
 #. type: Plain text
 #: en/git-diff.txt:64
@@ -20784,110 +20901,116 @@ msgstr "'git diff' [<options>] <commit> [--] [<chemin>...]"
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr "Cette forme sert 횪 visualiser les modifications pr챕sentes dans l'arbre de travail par rapport au <commit> indiqu챕. Vous pouvez utiliser HEAD pour le comparer au commit le plus r챕cent ou un nom de branche pour le comparer avec le sommet d'une branche diff챕rente."
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr "Si --merge-base est donn챕, au lieu d'utiliser <commit>, utiliser la base de fusion de <commit> et HEAD.  `git diff --merge-base A` est 챕quivalent 횪 `git diff $(git merge-base A HEAD)`."
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<chemin>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr "Ceci sert 횪 visualiser les modifications entre deux <commit> arbitraires."
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr "Si --merge-base est donn챕, utiliser la base de fusion des deux commits pour le c척t챕 \"before\". `git diff --merge-base A B` est 챕quivalent 횪 `git diff $ (git merge-base A B) B`."
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr "'git diff' [<options>] <commit> <commit>...<commit> [--] [<chemin>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr "Cette forme permet de visualiser les r챕sultats d'un commit de fusion.  Le premier <commit> indiqu챕 doit 챗tre la fusion elle-m챗me ; les deux autres commits ou plus doivent 챗tre ses parents.  Une fa챌on pratique de produire l'ensemble des r챕visions souhait챕es est d'utiliser le suffixe `^@`.  Par exemple, si `master` nomme un commit de fusion, `git diff master^@` donne la m챗me diff챕rence combin챕e que `git show master`."
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "'git diff' [<options>] <commit>..<commit> [--] [<chemin>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr "Cette forme est synonyme de la forme pr챕c챕dente (sans le `..`) pour visualiser les modification entre deux <commit>s arbirtraires. Si <commit> est omis d'un c척t챕, cela aura le m챗me effet que de sp챕cifier HEAD 횪 la place."
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "'git diff' [<options>] <commit>\\...<commit> [--] [<chemin>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 "Cette forme sert 횪 visualiser les modifications sur la branche contenant et jusqu'au second <commit>, en d챕butant 횪 l'anc챗tre commun au deux <commit>. `git diff A\\...B` est 챕quivalent 횪 `git diff $(git merge-base A B) B`. Vous pouvez omettre l'un ou l'autre <commit>, ce qui a le m챗me effet que de sp챕cifier HEAD 횪 la place."
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr "Juste au cas o첫 vous feriez quelque chose d'exotique, il doit 챗tre not챕 que tous les <commit> dans la description ci-dessus, except챕 dans le cas de `--merge-base` et dans les deux derni챔res formes qui utilisent les notations `..`, peuvent 챗tre n'importe quel <arbre>."
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 "Pour une liste plus compl챔te des moyens de sp챕cifier <commit>, voir la section 짬혻SP횋CIFIER LES R횋VISIONS혻쨩 dans linkgit:gitrevisions[7]. Cependant, \"diff\" concerne la comparaison de deux _point finaux_, et non d'intervalles, et les notations d'intervalle (`<commit>..<commit>` et `<commit>\\...<commit>`) ne r챕f챔rent pas un intervalle tel que d챕fini dans la section 짬혻SP횋CIFIER LES R횋VISIONS혻쨩 de linkgit:gitrevisions[7]."
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr "'git diff' [<options>] <blob> <blob>"
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr "Cette forme sert 횪 visualiser la diff챕rence entre les contenus bruts de deux objets blob."
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr "Comparer l'arbre de travail avec la version de 짬혻base혻쨩 (챕tape #1), 짬혻notre branche혻쨩 (챕tape #2) ou 짬혻leur branche혻쨩 (챕tape #3). L'index contient ces 챕tapes seulement pour les entr챕es non-fusionn챕es, c'est-횪-dire lors de la r챕solution de conflits. Voir la section 짬혻Fusion 횪 3 points혻쨩 de linkgit:git-read-tree[1] pour de plus amples informations."
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr "Omettre la sortie de diff pour les entr챕es non-fusionn챕es et affiche juste 짬혻Non fusionn챕혻쨩. Ne peut 챗tre utilis챕 que lors de comparaison de l'arbre de travail avec l'index."
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr "Les param챔tres <chemin>, quand sp챕cifi챕s, sont utilis챕s pour limiter la diff챕rence aux chemins indiqu챕s (vous pouvez indiquer des noms de r챕pertoire et visualiser les diff챕rences pour tous les fichiers qu'ils contiennent)."
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr "Diff챕rents moyens de v챕rifier votre arbre de travail"
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20899,31 +21022,31 @@ msgstr ""
 "$ git diff HEAD       <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr "Modifications dans l'arbre de travail pas encore index챕es pour la prochaine validation."
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr "Modifications entre l'index et votre dernier commit혻; ce que vous valideriez si vous lanciez `git commit` sans l'option `-a`."
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr "Modifications dans l'arbre de travail depuis votre dernier commit혻; ce que vous valideriez si vous lanciez `git commit -a`"
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr "Comparaison de deux commits arbitraires"
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20935,31 +21058,31 @@ msgstr ""
 "$ git diff HEAD^ HEAD      <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr "Au lieu d'utiliser le sommet de la branche actuelle, compare avec le sommet de la branche 짬혻test혻쨩."
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr "Au lieu de comparer avec le sommet de la branche 짬혻test혻쨩, compare avec le sommet de la branche actuelle, mais limite la comparaison au fichier 짬혻test혻쨩."
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr "Compare la version pr챕c챕dant le dernier commit et le dernier commit."
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr "Comparaison de branches"
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20971,31 +21094,31 @@ msgstr ""
 "$ git diff sujet...master  <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr "Modifications entre les sommets des branches sujet et master."
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr "Identique 횪 ci-dessus."
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr "Modifications pr챕sentes sur la branche master depuis que la branche sujet en a diverg챕."
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr "Limitation de la sortie du diff"
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -21007,31 +21130,31 @@ msgstr ""
 "$ git diff arch/i386 include/asm-i386   <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr "Ne montre que les modifications, les renommages et les copies, mais pas les additions ou les suppressions."
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr "Ne montre que les noms et la nature de la modification, mais pas la sortie de diff."
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr "Limite la sortie de diff aux sous-arbres indiqu챕s."
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr "Bricoler la sortie diff"
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -21041,19 +21164,19 @@ msgstr ""
 "$ git diff -R                          <2>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr "D챕pense des cycles suppl챕mentaires de CPU pour trouver les renommages, les copies ou les r챕챕critures compl챔tes (tr챔s cher)."
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr "Affiche les diff invers챕s."
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, 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], linkgit:git-show[1]"
 msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -28273,7 +28396,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31716,373 +31839,374 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr "--decorate[=short|full|auto|no]"
 
 #. type: Plain text
-#: en/git-log.txt:43
-#, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+#: en/git-log.txt:45
+#, fuzzy, priority:260
+#| msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr "Imprimer les noms de r챕ference des commits affich챕s. Si 'short' est sp챕cifi챕, les pr챕fixes des noms de r챕f챕rence 'refs/heads/', 'refs/tags/' et 'refs/remotes/' ne seront pas affich챕s. Si 'full' est sp챕cifi챕, le nom complet de la r챕f챕rence (y compris le pr챕fixe) sera imprim챕. Si 'auto' est sp챕cifi챕, alors si la sortie va 횪 un terminal, les noms de r챕f챕rence sont affich챕s comme si 'short' ont 챕t챕 donn챕, sinon aucun nom de r챕f챕rence n'est affich챕. L'option par d챕faut est 'short'."
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr "--decorate-refs=<motif>"
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr "--decorate-refs-exclude=<motif>"
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr "Si aucun `--decorate-refs' n'est donn챕, faire comme si tous les refs 챕taient inclus.  Pour chaque candidat, ne pas l'utiliser pour la d챕coration s'il correspond 횪 un motif fourni 횪 `--decorate-refs-exclude' ou s'il ne correspond 횪 aucun des motifs fournis 횪 `--decorate-refs'. L'option de configuration `log.excludeDecoration` permet d'exclure les r챕f챕rences des d챕corations, mais un motif explicite `--decorate-refs` remplacera une correspondance dans `log.excludeDecoration`."
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr "Imprimer le nom de la r챕f챕rence donn챕 sur la ligne de commande par lequel chaque commit a 챕t챕 atteint."
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr "Utiliser le fichier mailmap pour mapper les noms d'auteurs et de validateurs et les adresses email avec les vrais noms et adresses email canoniques. Voir linkgit:git-shortlog[1]."
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 "Sans ce drapeau, `git log -p <p <chemin>...` affiche les commits qui touchent les chemins sp챕cifi챕s, et diffs sur les m챗mes chemins sp챕cifi챕s.  Avec ceci, le diff complet est affich챕 pour les commits qui touchent les chemins sp챕cifi챕s ; cela signifie que \"<chemin>...\" limite seulement les commits, et ne limite pas le diff pour ces commits."
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr "Notez que cela affecte tous les types de sortie bas챕s sur le diff, par exemple ceux produits par '---stat', etc."
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr "Inclure une ligne ''log size <nombre>'' dans la sortie pour chaque commit, o첫 <nombre> est la longueur du message de ce commit en octets.  Destin챕 횪 acc챕l챕rer les outils qui lisent les messages de journal de la sortie 'git log' en leur permettant d'allouer de l'espace 횪 l'avance."
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr "<plage de r챕visions>"
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr "Afficher uniquement les commits dans la plage de r챕vision sp챕cifi챕e.  Lorsqu'aucune <plage-de-r챕vision> n'est sp챕cifi챕e, elle vaut par d챕faut `HEAD` (c'est-횪-dire tout l'historique menant au commit actuel).  `origin...HEAD` sp챕cifie tous les commits accessibles depuis le commit courant (c-횪-d `HEAD`), mais pas depuis `origin`. Pour une liste compl챔te des fa챌ons d'챕peler <plage-de-r챕vision>, voir la section'Sp챕cification des plages' de linkgit:gitrevisions[7]."
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr "[--] <chemin>..."
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr "Afficher uniquement les commits qui sont suffisants pour expliquer comment les fichiers qui correspondent aux chemins sp챕cifi챕s sont venus 횪 exister.  Voir 'Simplification de l'historique' ci-dessous pour plus de d챕tails et d'autres modes de simplification."
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr "Les chemins peuvent avoir besoin d'챗tre pr챕fix챕s avec `--` pour les s챕parer des options ou de la plage de r챕vision, en cas de confusion."
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr "MISE EN FORME DIFF"
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr "Par d챕faut, `git log` ne g챕n챔re aucune sortie de diff. Les options ci-dessous peuvent 챗tre utilis챕es pour afficher les modifications faites par chaque commit."
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr "Notez que sauf si une des variantes de `--diff-merges` (incluant les options courtes`-m`, `-c` et `--cc`) est donn챕e explicitement, les commits de fusion ne vont pas afficher de diff, m챗me si un format de diff tel que `--patch` est s챕lectionn챕, et ils ne correspondront pas aux options telles que `-S`. L'exception sera lors de l'utilisation de `--first-parent`, pour laquelle le format par d챕faut est `first-parent`."
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr "`git log --no-merges`"
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr "Affiche tout l'historique des commits, mais saute toutes les fusions"
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr "`git log v2.6.12.. include/scsi drivers/scsi`"
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr "Affiche tous les commits depuis la version 'v2.6.12' qui a modifi챕 n'importe quel fichier dans les sous-directeurs 'include/scsi' ou 'drivers/scsi'"
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr "`git log --since=\"2 weeks ago\" -- gitk`"
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr "Affiche les modifications au cours des deux derni챔res semaines au fichier 'gitk'.  Le '--' est n챕cessaire pour 챕viter toute confusion avec la branche 'nomm챕e 'gitk'"
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr "`git log --name-status release..test`"
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr "Affiche les commits qui se trouvent dans la branche \"test\" mais pas encore dans la branche \"lib챕ration\", ainsi que la liste des chemins que chaque commit modifie."
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr "`git log --follow builtin/rev-list.c`"
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr "Affiche les commits qui ont chang챕 'builtin/rev-list.c', y compris les commits qui se sont produits avant que le fichier ne soit appel챕 par son nom actuel."
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr "`git log --branches --not --remotes=origin`"
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr "Affiche tous les commits qui sont dans l'une des branches locales, mais pas dans l'une des branches de suivi 횪 distance pour 짬 origin 쨩 (ce que vous avez que cette origine n'est pas)."
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr "`git log master --not --remotes=*/master`"
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr "Affiche tous les commits qui sont dans la branche master locale mais pas dans les branches master du d챕p척t distant."
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr "`git log -p -m --first-parent`"
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr "Affiche l'historique, y compris les diffs de changement, mais seulement du point de vue de la 짬 branche principale 쨩, en sautant les commits qui proviennent de branches fusionn챕es, et en montrant des diffs complets des changements introduits par les fusions.  Cela n'a de sens que lorsqu'il s'agit de suivre une politique stricte de fusion de toutes les branches th챕matiques lorsqu'on reste sur une seule branche d'int챕gration."
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr "`git log -L '/int main/',/^}/:main.c`"
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr "Montre comment la fonction 'main()' dans le fichier 'main.c'a 챕volu챕 au fil du temps."
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr "`git log -3`"
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr "Limite le nombre de commits 횪 afficher 횪 3."
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr "Voir linkgit:git-config[1] pour les variables de base et linkgit:git-diff[1] pour les param챔tres li챕s 횪 la g챕n챕ration diff."
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr "La valeur par d챕faut de l 'option `- -format`.(voir ci-dessus 짬 Mise en forme 쨩) par d챕faut `medium`."
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr "Encodage 횪 utiliser lors de l'affichage des journaux.  (Voir 'Discussion' ci-dessus.)  Par d챕faut 횪 la valeur de 'i18n.commitEncoding' si elle est fix챕e, et UTF-8 autrement."
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr "Format par d챕faut pour les dates humainement lisibles.  (Compare l'option '--date'.)  Par d챕faut 횪 \"d챕faut\", ce qui signifie 챕crire des dates comme `Sat May 8 19:35:34 2010 -0500`."
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr "Si le format est r챕gl챕 sur \"auto:foo\" et que le paginateur est utilis챕, le format \"foo\" sera utilis챕 pour le format de date. Sinon, \"default\" sera utilis챕."
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr "Si `true`, `git log` agira comme si l'option `--follow' 챕tait utilis챕e lorsqu'un seul <chemin> est donn챕.  Ceci a les m챗mes limitations que `--follow', c'est-횪-dire qu'il ne peut pas 챗tre utilis챕 pour suivre plusieurs fichiers et ne fonctionne pas bien sur un historique non lin챕aire."
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr "Si `false`, `git log` et les commandes associ챕es ne traiteront pas le commit initial comme un grand 챕v챕nement de cr챕ation.  Tout commit racine dans la sortie `git log -p` serait affich챕 sans diff attach챕.  La valeur par d챕faut est `true`."
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr "Si `true`, `git log` et les commandes associ챕es agiront comme si l'option `--show-signature` leur 챕tait pass챕e."
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr "mailmap.*"
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr "Voir linkgit:git-shortlog[1]."
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr "notes.displayRef"
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr "Quelles refs, en plus de la d챕finition par d챕faut par `core.notesRef` ou `GIT-NOTES-REF`, depuis lequelles lire les notes lors de l'affichage des messages de validation avec la famille de commandes `log`.  Voir linkgit:git-notes[1]."
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr "Peut 챗tre un nom de r챕f챕rence non abr챕g챕 ou un glob et peut 챗tre sp챕cifi챕 plusieurs fois.  Un avertissement sera 챕mis pour les r챕f챕rences qui n'existent pas, mais un glob qui ne correspond 횪 aucune r챕f챕rence est ignor챕 en silence."
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr "Ce param챔tre peut 챗tre d챕sactiv챕 par l'option `--no-notes`, remplac챕 par la variable d'environnement `GIT_NOTES_DISPLAY_REF`, et remplac챕 par l'option `--notes=<ref>`."
@@ -37264,7 +37388,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -37280,7 +37404,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -37484,7 +37608,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -37520,7 +37644,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37629,7 +37753,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -38192,8 +38316,9 @@ msgstr "Lorsqu'il est d챕fini sur `preserve` (d챕conseill챕 en faveur de `merges
 
 #. type: Plain text
 #: en/git-pull.txt:121
-#, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+#, fuzzy, priority:220
+#| msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr "Lorsqu'elle est fausse, fusionner la branche actuelle dans la branche amont."
 
 #. type: Plain text
@@ -38686,8 +38811,9 @@ msgstr "Cette option passe outre cette restriction si la valeur actuelle de la r
 
 #. type: Plain text
 #: en/git-push.txt:249
-#, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+#, fuzzy, priority:220
+#| msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr "Imaginez que vous devez rebaser ce que vous avez d챕j횪 publi챕. Vous devrez contourner la r챔gle \"doit avancer rapidement\" afin de remplacer l'historique que vous avez initialement publi챕 par l'historique rebas챕. Si quelqu'un d'autre a construit sur votre historique d'origine pendant que vous rebasez, le sommet de la branche distante peut avoir avanc챕 avec son commit, et pousser aveugl챕ment avec `--force` 챕liminera son travail."
 
 #. type: Plain text
@@ -43912,115 +44038,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr "Passer l'option `--delta-islands` 횪 `git-pack-objects`, voir linkgit:git-pack-objects[1]."
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -45125,7 +45251,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:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr "Interruption du flux de travail"
@@ -47600,522 +47726,541 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:170
+#, fuzzy, no-wrap, priority:100
+#| msgid "--setup <command>"
+msgid "--sendmail-cmd=<command>"
+msgstr "--setup <commande>"
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
 #, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr "--smtp-server-option=<option>"
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr "--batch-size=<num>"
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr "--identity=<identit챕>"
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -48125,151 +48270,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr "Information"
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr "sendmail"
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -48280,25 +48425,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -48307,19 +48452,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, 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)"
@@ -49890,7 +50035,19 @@ msgid ""
 "'git stash' clear\n"
 "'git stash' create [<message>]\n"
 "'git stash' store [-m|--message <message>] [-q|--quiet] <commit>\n"
-msgstr "'git stash' list [<options-de-log>]\n'git stash' show [-u|--include-untracked|--only-untracked] [<options-de-diff>] [<remisage>]\n'git stash' drop [-q|--quiet] [<remisage>]\n'git stash' ( pop | apply ) [--index] [-q|--quiet] [<remisage>]\n'git stash' branch <nom-de-branche> [<remisage>]\n'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n\t     [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n\t     [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n\t     [--] [<sp챕c-de-chemin>...]]\n'git stash' clear\n'git stash' create [<message>]\n'git stash' store [-m|--message <message>] [-q|--quiet] <commit>\n"
+msgstr ""
+"'git stash' list [<options-de-log>]\n"
+"'git stash' show [-u|--include-untracked|--only-untracked] [<options-de-diff>] [<remisage>]\n"
+"'git stash' drop [-q|--quiet] [<remisage>]\n"
+"'git stash' ( pop | apply ) [--index] [-q|--quiet] [<remisage>]\n"
+"'git stash' branch <nom-de-branche> [<remisage>]\n"
+"'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"\t     [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"\t     [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
+"\t     [--] [<sp챕c-de-chemin>...]]\n"
+"'git stash' clear\n"
+"'git stash' create [<message>]\n"
+"'git stash' store [-m|--message <message>] [-q|--quiet] <commit>\n"
 
 #. type: Plain text
 #: en/git-stash.txt:31
@@ -49975,253 +50132,254 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr "show [-u|--include-untracked|--only-untracked] [<options-diff>] [<remisage>]"
 
 #. type: Plain text
-#: en/git-stash.txt:96
-#, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+#: en/git-stash.txt:98
+#, fuzzy, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr "Afficher les modifications enregistr챕es dans l'entr챕e de remisage comme une diff챕rence entre le contenu du remisage et le commit tel qu'il 챕tait quand l'entr챕e de remisag a 챕t챕 cr챕챕e pour la premi챔re fois.  Par d챕faut, la commande affiche le diffstat, mais elle accepte tout format connu de 'git diff' (par exemple, `git stash show -p stash@{1}` pour afficher la deuxi챔me entr챕e la plus r챕cente sous forme de rustine).  Vous pouvez utiliser les variables de configuration  stash.showIncludeUntracked, stash.showStat et stash.showPatch pour modifier le comportement par d챕faut."
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr "pop [--index] [-q|--quiet] [<remise>]"
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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 "Supprimer un seul remisage de la liste des remisages et l'appliquer par dessus l'챕tat de l'arbre de travail actuel, c'est-횪-dire faire l'op챕ration inverse de `git stash push`. Le r챕pertoire de travail doit correspondre 횪 l'index."
 
 #. type: Plain text
-#: en/git-stash.txt:107
+#: en/git-stash.txt:109
 #, 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 "L'application de l'챕tat peut 챕chouer en cas de conflit ; dans ce cas, il n'est pas retir챕 de la liste de remisages. Vous devez r챕soudre les conflits 횪 la main et appeler ensuite `git stash drop` manuellement."
 
 #. type: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr "apply [--index] [-q|--quiet] [<remise>]"
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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 "Comme `pop`, mais ne pas supprimer l'챕tat de la liste de remisages. Contrairement 횪 `pop`, `<stash>` peut 챗tre n'importe quel commit qui ressemble 횪 un commit cr챕챕 par `stash push` ou `stash create`."
 
 #. type: Labeled list
-#: en/git-stash.txt:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr "branch <nom-de-branche> [<remisage>]"
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr "Cr챕er et extraire une nouvelle branche nomm챕e `<nom-de-branche>` 횪 partir du commit o첫 le `<remisage>` a 챕t챕 cr챕챕 횪 l'origine, appliquer les modifications enregistr챕es dans le `<remisage>` au nouvel arbre de travail et 횪 l'index.  Si cela r챕ussit, et que  le `<remisage>` est une r챕f챕rence de la forme `stash@{<r챕vision>}`, abandonner alors le `<remisage>`."
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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 "Ceci est utile si la branche sur laquelle vous avez lanc챕 `git stash push` a suffisamment chang챕 pour que `git stash apply` 챕choue 횪 cause de conflits. Puisque l'entr챕e de remisage est appliqu챕e sur le commit qui 챕tait HEAD au moment o첫 `git stash` a 챕t챕 lanc챕, elle restaure l'챕tat d'origine remis챕 sans conflit."
 
 #. type: Labeled list
-#: en/git-stash.txt:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr "clear"
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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 "Supprimer toutes les entr챕es de remisage. Notez que ces entr챕es seront alors soumises 횪 un 챕lagage et pourraient 챗tre impossibles 횪 r챕cup챕rer (voir \"Exemples\" ci-dessous pour une strat챕gie possible)."
 
 #. type: Labeled list
-#: en/git-stash.txt:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr "drop [-q|--quiet] [<remisage>]"
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr "Supprimer une seule entr챕e de la liste des entr챕es de remisage."
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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 "Cr챕er une entr챕e de remisage (qui est un objet commit r챕gulier) et renvoyer son nom d'objet, sans le stocker nulle part dans l'espace de noms de r챕f챕rences.  Ceci est destin챕 횪 챗tre utilis챕 par les scripts.  Ce n'est probablement pas la commande que vous voulez utiliser ; voir \"push\" ci-dessus."
 
 #. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr "store"
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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 "Stocker un remisage donn챕 cr챕챕 via 'git stash create' (qui est un commit de fusion en cours) dans la r챕f챕rence de remisage, en mettant 횪 jour le reflog de remisage.  Ceci est destin챕 횪 챗tre utilis챕 par des scripts.  Ce n'est probablement pas la commande que vous souhaitez utiliser ; voir \"push\" ci-dessus."
 
 #. type: Plain text
-#: en/git-stash.txt:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr "Cette option n'est valable que pour les commandes `push` et `save`."
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr "Tous les fichiers ignor챕s et non trac챕s sont 챕galement remis챕s puis nettoy챕s avec `git clean`."
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr "Lorsqu'elle est utilis챕e avec les commandes `push` et `save`, tous les fichiers non suivis sont 챕galement stock챕s et ensuite nettoy챕s avec `git clean`."
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr "Utilis챕 avec la commande `show`, montrer les fichiers non suivis dans l'entr챕e de remisage comme faisant partie du diff."
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr "Cette option n'est valide que pour la commande `show`."
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr "Afficher uniquement les fichiers non suivis dans l'entr챕e de remisage en tant que partie du diff."
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr "Cette option n'est valable que pour les commandes `pop` et `apply`."
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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 "Tenter de r챕tablir non seulement les modifications de l'arbre de travail, mais aussi celles de l'index. Cependant, cela peut 챕chouer, lorsque vous avez des conflits (qui sont stock챕s dans l'index, o첫 vous ne pouvez donc plus appliquer les modifications telles qu'elles 챕taient 횪 l'origine)."
 
 #. type: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr "Tous les changements d챕j횪 ajout챕s 횪 l'index sont laiss챕s intacts."
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr "S챕lectionner interactivement les section 횪 remiser 횪 partir de la diff챕rence entre HEAD et l'arbre de travail.  L'entr챕e de remisage est construite de mani챔re 횪 ce que son 챕tat d'index soit le m챗me que celui de votre d챕p척t, et son arbre de travail ne contient que les modifications que vous avez s챕lectionn챕es de mani챔re interactive.  Les modifications s챕lectionn챕es sont ensuite invers챕es 횪 partir de votre arbre de travail. Voir la section \"Mode interactif\" de linkgit:git-add[1] pour savoir comment utiliser le mode `--patch`."
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr "L'option `--patch` implique `--keep-index`.  Vous pouvez utiliser l'option `--no keep-index` pour passer outre."
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr "Cette option n'est valide que pour la commande `push`."
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr "Cette option n'est valable que pour les commandes `apply`, `drop`, `pop`, `push`, `save`, `store`."
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr "S챕pare le sp챕cificateur de chemin et les options 횪 des fins de d챕sambigu챦sation."
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr "La nouvelle entr챕e de remisage enregistre les 챕tats modifi챕s uniquement pour les fichiers qui correspondent au sp챕cificateur de chemin.  Les entr챕es d'index et les fichiers de l'arbre de travail sont ensuite ramen챕es 횪 l'챕tat de HEAD uniquement pour ces fichiers, 챕galement, laissant intacts les fichiers qui ne correspondent pas 횪 la sp챕cification du chemin."
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr "<remisage>"
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr "Cette option n'est valable que pour les commandes `apply`, `branch`, `drop`, `pop`, `show`."
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr "Une r챕f챕rence de la forme `stash@{<r챕vision>}`. Lorsqu'aucun `<remisage>` n'est donn챕, le dernier remisage est suppos챕 (c'est-횪-dire, `stash@{0}`)."
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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 "Une entr챕e de remisage est repr챕sent챕e par un commit dont l'arbre enregistre l'챕tat du r챕pertoire de travail, et son premier parent est le commit 횪 `HEAD` lorsque l'entr챕e a 챕t챕 cr챕챕e.  L'arborescence du second parent enregistre l'챕tat de l'index lorsque l'entr챕e est cr챕챕e, et il est consid챕r챕 comme un enfant du commit `HEAD`.  Le graphique d'ascendance ressemble 횪 ceci :"
 
 #. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -50233,31 +50391,31 @@ msgstr ""
 "     -----H----I\n"
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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 "o첫 `H` est le commit `HEAD`, `I` est un commit qui enregistre l'챕tat de l'index, et `W` est un commit qui enregistre l'챕tat de l'arbre de travail."
 
 #. type: Labeled list
-#: en/git-stash.txt:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr "Tirer dans un arbre sale"
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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 "Lorsque vous 챗tes au milieu de quelque chose, vous apprenez qu'il y a des changements en amont qui peuvent avoir un rapport avec ce que vous faites.  Lorsque vos changements locaux n'entrent pas en conflit avec les changements en amont, un simple `git pull` vous permettra d'aller de l'avant."
 
 #. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:286
 #, 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 "Cependant, il y a des cas o첫 vos modifications locales entrent en conflit avec les changements en amont, et `git pull` refuse d'챕craser vos modifications.  Dans ce cas, vous pouvez remiser vos modifications, effectuer un tirage, puis les d챕stocker, comme ceci :"
 
 #. type: delimited block -
-#: en/git-stash.txt:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -50275,13 +50433,13 @@ msgstr ""
 "$ git stash pop\n"
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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 "Lorsque vous 챗tes au milieu de quelque chose, votre patron arrive et vous demande de r챕parer quelque chose imm챕diatement.  Traditionnellement, vous fa챤tes un commit dans une branche temporaire pour stocker vos modifications et vous retournez dans votre branche d'origine pour effectuer la r챕paration d'urgence, comme ceci :"
 
 #. type: delimited block -
-#: en/git-stash.txt:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -50305,13 +50463,13 @@ msgstr ""
 "# ... continue le travail ...\n"
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr "Vous pouvez utiliser 'git stash' pour simplifier ce qui pr챕c챔de, comme ceci :"
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -50329,19 +50487,19 @@ msgstr ""
 "# ... continue le travail ...\n"
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr "Test des commits partiels"
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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 "Vous pouvez utiliser `git stash push --keep-index` lorsque vous voulez faire deux ou plusieurs commits 횪 partir des modifications dans l'arbre de travail, et que vous voulez tester chaque modification avant de faire un commit :"
 
 #. type: delimited block -
-#: en/git-stash.txt:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -50365,19 +50523,19 @@ msgstr ""
 "$ git commit foo -m 'Partie restante'\n"
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr "R챕cup챕ration des entr챕es de remisage qui ont 챕t챕 effac챕es/abandonn챕es par erreur"
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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 "Si vous laissez tomber ou videz par erreur les entr챕es de remisage, elles ne peuvent pas 챗tre r챕cup챕r챕es par les m챕canismes de s챕curit챕 habituels.  Cependant, vous pouvez essayer l'incantation suivante pour obtenir une liste des entr챕es de remisage qui sont toujours dans votre d챕p척t, mais qui ne sont plus accessibles :"
 
 #. type: delimited block -
-#: en/git-stash.txt:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -50389,7 +50547,7 @@ msgstr ""
 "xargs git log --merges --no-walk --grep=WIP\n"
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -52592,7 +52750,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -54869,7 +55027,13 @@ msgid ""
 "    [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
 "    [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
 "    <command> [<args>]\n"
-msgstr "'git' [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n    [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-path]\n    [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n    [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n    [--super-prefix=<path>] [--config-env =<nom>=<var-env>]\n    <commande> [<args>]\n"
+msgstr ""
+"'git' [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n"
+"    [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-path]\n"
+"    [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
+"    [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n"
+"    [--super-prefix=<path>] [--config-env =<nom>=<var-env>]\n"
+"    <commande> [<args>]\n"
 
 #. type: Plain text
 #: en/git.txt:24
@@ -58725,9 +58889,18 @@ msgstr "git-worktree - G챕rer plusieurs arbres de travail"
 
 #. type: Plain text
 #: en/git-worktree.txt:20
-#, ignore-ellipsis, no-wrap, priority:240
-msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+#, fuzzy, ignore-ellipsis, no-wrap, priority:240
+#| msgid ""
+#| "'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+#| "'git worktree list' [--porcelain]\n"
+#| "'git worktree lock' [--reason <string>] <worktree>\n"
+#| "'git worktree move' <worktree> <new-path>\n"
+#| "'git worktree prune' [-n] [-v] [--expire <expire>]\n"
+#| "'git worktree remove' [-f] <worktree>\n"
+#| "'git worktree repair' [<path>...]\n"
+#| "'git worktree unlock' <worktree>\n"
+msgid ""
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -59041,8 +59214,9 @@ msgstr "--reason <cha챤ne>"
 
 #. type: Plain text
 #: en/git-worktree.txt:246
-#, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+#, fuzzy, priority:240
+#| msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr "Avec `lock`, une explication de la raison pour laquelle l'arbre de travail est verrouill챕."
 
 #. type: Labeled list
@@ -59235,11 +59409,16 @@ msgstr "`prunable`, si l'arbre de travail peut 챗tre 챕lagu챕 via` git worktree
 
 #. type: delimited block -
 #: en/git-worktree.txt:392
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
+#| msgid ""
+#| "$ git worktree list\n"
+#| "/path/to/linked-worktree    abcd1234 [master]\n"
+#| "/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+#| "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 "$ git worktree list\n"
@@ -59758,7 +59937,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -63458,194 +63637,230 @@ msgstr "Sp챕cifier plusieurs r챕visions signifie l'ensemble de commits accessibl
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -65286,8 +65501,9 @@ msgstr "La forme '--filter=object:type=(tag|commit|tree|blob)' permet d'omettre
 
 #. type: Plain text
 #: en/rev-list-options.txt:902
-#, 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."
+#, fuzzy, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr "La forme '--filter=sparse:oid=<blob-esque>' utilise une sp챕cification d'extraction clairsem챕e contenue dans le blob (ou l'expression de blob) '<blob-esque>' pour omettre les blobs qui ne seraient pas n챕cessaires pour une extraction clairsem챕e sur les r챕f챕rences demand챕es."
 
 #. type: Plain text
@@ -65548,56 +65764,81 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr "Afficher le contenu du commit en format brut ; chaque enregistrement est s챕par챕 par un caract챔re NUL."
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, fuzzy, priority:260
+#| msgid "Overrides a previous `--no-walk`."
+msgid "Overrides a previous `--no-commit-header`."
+msgstr "Remplacer un `--no-walk` pr챕c챕dent."
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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 "Afficher aussi les parents du commit (sous la forme \"parent du commit...\").  Permet 챕galement la r챕챕criture des parents, voir \" Simplification de l'historique \" ci-dessus."
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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 "Afficher aussi les enfants du commit (sous la forme \"commit child...\").  Permet 챕galement la r챕챕criture des parents, voir \" Simplification de l'historique \" ci-dessus."
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr "Imprimer l'horodatage brut du commit."
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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 "Indiquer de quel c척t챕 d'une diff챕rence sym챕trique un commit est accessible.  Les commits de gauche sont pr챕fix챕s par \" < \" et ceux de  droite par \" > \".  Si on combine avec `--boundary`, ces commits sont pr챕fix챕s par `-`."
 
 #. type: Plain text
-#: en/rev-list-options.txt:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr "Par exemple, si vous avez cette topologie :"
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -65613,19 +65854,19 @@ msgstr ""
 "\t o---x---a---a  branche A\n"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr "vous obtiendriez une sortie comme celle-ci :"
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
 msgstr "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -65643,43 +65884,43 @@ msgstr ""
 "\t-xxxxxxx... 1st on a\n"
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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 "Dessiner une repr챕sentation graphique en texte de l'historique du commit sur la gauche de la sortie.  Cela peut entra챤ner l'impression de lignes suppl챕mentaires entre les validations, afin que l'historique du graphique soit correctement trac챕.  Ne peut pas 챗tre combin챕 avec `--no-walk`."
 
 #. type: Plain text
-#: en/rev-list-options.txt:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr "Cela permet la r챕챕criture des parents, voir 짬 Simplification de l'historique 쨩 ci-dessus."
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, priority:260
 msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
 msgstr "Cela implique l'option `--topo-order` par d챕faut, mais l'option `--date-order` peut aussi 챗tre sp챕cifi챕e."
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr "--show-linear-break [=<barri챔re>]"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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 "Lorsque --graph n'est pas utilis챕, toutes les branches de l'historique sont aplaties, ce qui peut rendre difficile de voir que les deux commits cons챕cutifs n'appartiennent pas 횪 une branche lin챕aire. Dans ce cas, cette option met une barri챔re entre les deux. Si `<barri챔re>` est sp챕cifi챕, c'est la cha챤ne de caract챔res qui sera affich챕e 횪 la place de celle par d챕faut."
 
 #. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1147
 #, 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 "Imprimer un nombre indiquant combien de commits auraient 챕t챕 list챕s, et supprimer toutes les autres sorties.  Lorsqu'il est utilis챕 avec `--left-right`, imprimer 횪 la place les comptes des commits gauche et droite, s챕par챕s par une tabulation. Lorsqu'utilis챕 avec `--cherry-mark`, omettre les commits 챕quivalents de rustines de ces comptes et imprimer le compte des commits 챕quivalents s챕par챕s par une tabulation."
@@ -68190,6 +68431,13 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
 
+#~ 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 "Les options `-M` et `-C` n챕cessitent un temps de traitement en O(n짼) o첫 n est le nombre de cibles potentielles renommage/copie. Cette option emp챗che l'utilisation de la d챕tection de renommage/copie si le nombre de cibles de renommage/copie exc챔de le nombre indiqu챕."
+
+#, ignore-ellipsis, no-wrap
+#~ msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+#~ msgstr "'git diff' [<options>] <commit> [--] [<chemin>...]"
+
 #, no-wrap
 #~ msgid "--no-diff-merges:"
 #~ msgstr "--no-diff-merges:"
diff --git a/po/documentation.hu.po b/po/documentation.hu.po
index d54333b1311a4c11de69f606b576f436b81724fe..2d2174c607f5c607cc72f95314c4882f6914d371 100644
--- a/po/documentation.hu.po
+++ b/po/documentation.hu.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: 2021-05-17 17:03+0200\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
 "PO-Revision-Date: 2021-01-19 16:32+0000\n"
 "Last-Translator: Lilian Wang <li330wang@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Weblate 4.5-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -78,7 +78,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -90,7 +90,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 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:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -138,7 +138,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2819,7 +2819,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2853,139 +2853,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3869,13 +3869,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3962,33 +3962,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -3997,7 +3997,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4496,7 +4496,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4528,7 +4528,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4755,7 +4755,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4767,7 +4767,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5121,79 +5121,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5202,430 +5202,430 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--skip-to=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--rotate-to=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5763,55 +5763,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5819,397 +5837,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6292,13 +6310,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr ""
@@ -6328,7 +6346,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6358,13 +6376,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6538,31 +6556,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr ""
@@ -6574,7 +6592,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6928,7 +6946,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6940,13 +6958,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7384,7 +7402,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7596,7 +7614,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7896,7 +7914,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8166,7 +8184,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8304,7 +8322,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12270,7 +12288,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12654,7 +12672,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14076,7 +14094,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14869,7 +14887,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14975,7 +14993,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15105,7 +15123,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15117,7 +15135,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15828,557 +15846,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16441,14 +16453,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16459,7 +16483,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16469,7 +16493,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16479,7 +16503,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16489,7 +16513,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16501,157 +16525,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16661,13 +16685,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16680,19 +16704,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16700,13 +16724,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19342,103 +19366,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19446,25 +19470,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19472,13 +19496,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19486,7 +19510,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19494,13 +19518,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19508,37 +19532,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19568,19 +19592,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20168,7 +20192,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20350,13 +20374,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20365,110 +20389,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20477,31 +20507,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20510,31 +20540,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20543,31 +20573,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20576,31 +20606,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20608,19 +20638,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27822,7 +27852,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31259,373 +31289,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36732,7 +36762,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36748,7 +36778,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36952,7 +36982,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -36988,7 +37018,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37097,7 +37127,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37653,7 +37683,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38137,7 +38167,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43281,115 +43311,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44462,7 +44492,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46846,521 +46876,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47370,151 +47418,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47525,25 +47573,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47552,19 +47600,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49211,253 +49259,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49466,31 +49514,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49502,13 +49550,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49523,13 +49571,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49541,19 +49589,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49568,19 +49616,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49589,7 +49637,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51688,7 +51736,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57800,7 +57848,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58107,7 +58155,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -58300,7 +58348,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58778,7 +58826,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62458,194 +62506,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64223,7 +64307,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64484,56 +64568,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64544,19 +64652,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64568,43 +64676,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.id.po b/po/documentation.id.po
index 5dcd9fd73829bb1703b2d80fdcc466200e9c450f..b48f0e89383986945e1e36284a962922119c2dee 100644
--- a/po/documentation.id.po
+++ b/po/documentation.id.po
@@ -4,10 +4,22 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-05-17 17:03+0200\nPO-Revision-Date: 2021-05-29 11:33+0000\nLast-Translator: Jacque Fresco <aidter@use.startmail.com>\nLanguage-Team: none\nLanguage: id\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.7-dev\n"
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
+"PO-Revision-Date: 2021-05-29 11:33+0000\n"
+"Last-Translator: Jacque Fresco <aidter@use.startmail.com>\n"
+"Language-Team: none\n"
+"Language: id\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.7-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -67,7 +79,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -79,7 +91,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 msgid "-t"
 msgstr "-t"
@@ -115,7 +127,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -127,7 +139,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2808,7 +2820,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2842,139 +2854,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3858,13 +3870,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3951,33 +3963,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--diff-merges=first-parent:"
 msgid "--diff-merges=first-parent"
 msgstr "--diff-merges=first-parent:"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "--diff-merges=1:"
 msgid "--diff-merges=1"
 msgstr "--diff-merges=1:"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "--diff-merges=separate:"
 msgid "--diff-merges=separate"
@@ -3986,7 +3998,7 @@ msgstr "--diff-merges=separate:"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4485,7 +4497,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4517,7 +4529,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4744,7 +4756,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4756,7 +4768,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5110,79 +5122,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5191,430 +5203,430 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--skip-to=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--rotate-to=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5752,55 +5764,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5808,397 +5838,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6281,13 +6311,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr ""
@@ -6317,7 +6347,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6347,13 +6377,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6527,31 +6557,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr ""
@@ -6563,7 +6593,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6917,7 +6947,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6929,13 +6959,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "Sebagian suite linkgit:git[1]"
@@ -7373,7 +7403,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7585,7 +7615,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7885,7 +7915,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8155,7 +8185,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8293,7 +8323,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9134,7 +9164,9 @@ msgstr ""
 msgid ""
 "$ cat ~/test.sh\n"
 "#!/bin/sh\n"
-msgstr "$ cat ~/test.sh\n#!/bin/sh\n"
+msgstr ""
+"$ cat ~/test.sh\n"
+"#!/bin/sh\n"
 
 #. type: delimited block -
 #: en/git-bisect.txt:437
@@ -11069,7 +11101,9 @@ msgstr ""
 msgid ""
 "\tsymlink 4\n"
 "\t../f\n"
-msgstr "\tsymlink 4\n\t../f\n"
+msgstr ""
+"\tsymlink 4\n"
+"\t../f\n"
 
 #. type: Plain text
 #: en/git-cat-file.txt:173
@@ -12259,7 +12293,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12643,7 +12677,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14065,7 +14099,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14857,7 +14891,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14963,7 +14997,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15093,7 +15127,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15105,7 +15139,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15816,557 +15850,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16429,14 +16457,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16447,7 +16487,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16457,7 +16497,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16467,7 +16507,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16477,7 +16517,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16489,157 +16529,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16649,13 +16689,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16668,19 +16708,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16688,13 +16728,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -17173,7 +17213,10 @@ msgid ""
 "\t protocol=https\n"
 "\t host=example.com\n"
 "\t path=foo.git\n"
-msgstr "\t protocol=https\n\t host=example.com\n\t path=foo.git\n"
+msgstr ""
+"\t protocol=https\n"
+"\t host=example.com\n"
+"\t path=foo.git\n"
 
 #. type: Plain text
 #: en/git-credential.txt:69
@@ -17189,7 +17232,11 @@ msgid ""
 "host=example.com\n"
 "username=bob\n"
 "password=secr3t\n"
-msgstr "protocol=https\nhost=contoh.co.id\nusername=dwiarti\npassword=r4hsia\n"
+msgstr ""
+"protocol=https\n"
+"host=contoh.co.id\n"
+"username=dwiarti\n"
+"password=r4hsia\n"
 
 #. type: Plain text
 #: en/git-credential.txt:79
@@ -19330,103 +19377,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19434,25 +19481,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19460,13 +19507,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19474,7 +19521,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19482,13 +19529,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19496,37 +19543,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19556,19 +19603,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20156,7 +20203,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20338,13 +20385,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20353,110 +20400,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20465,31 +20518,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20498,31 +20551,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20531,31 +20584,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20564,31 +20617,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20596,19 +20649,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27810,7 +27863,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31245,373 +31298,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr "`git log -3`"
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -32844,7 +32897,10 @@ msgid ""
 "\t o---o---o---B\n"
 "\t/\n"
 "---o---1---o---o---o---A\n"
-msgstr "\t o---o---o---B\n\t/\n---o---1---o---o---o---A\n"
+msgstr ""
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
 
 #. type: Plain text
 #: en/git-merge-base.txt:90
@@ -35993,7 +36049,9 @@ msgstr ""
 msgid ""
 "//depot/main/...\n"
 "//depot/branch1/...\n"
-msgstr "//depot/main/...\n//depot/branch1/...\n"
+msgstr ""
+"//depot/main/...\n"
+"//depot/branch1/...\n"
 
 #. type: Plain text
 #: en/git-p4.txt:519
@@ -36718,7 +36776,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36734,7 +36792,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36938,7 +36996,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -36974,7 +37032,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37083,7 +37141,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37639,7 +37697,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38123,7 +38181,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43267,115 +43325,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44448,7 +44506,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46832,521 +46890,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
+#, priority:100
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr "--smtp-debug=0|1"
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47356,151 +47432,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47511,25 +47587,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47538,19 +47614,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49197,253 +49273,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49452,31 +49528,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49488,13 +49564,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49509,13 +49585,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49527,19 +49603,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49554,19 +49630,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49575,7 +49651,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51674,7 +51750,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57786,7 +57862,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58093,7 +58169,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -58286,7 +58362,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58764,7 +58840,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62444,194 +62520,237 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t o---o---o---B\n"
+#| "\t/\n"
+#| "---o---1---o---o---o---A\n"
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr "'<rev1>..<rev2>'"
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr "'<rev1>\\...<rev2>'"
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64060,7 +64179,10 @@ msgid ""
 "    ---1----2----4----7\n"
 "\t\\\t       \\\n"
 "\t 3----5----6----8---\n"
-msgstr "    ---1----2----4----7\n\t\\\t       \\\n\t 3----5----6----8---\n"
+msgstr ""
+"    ---1----2----4----7\n"
+"\t\\\t       \\\n"
+"\t 3----5----6----8---\n"
 
 #. type: Plain text
 #: en/rev-list-options.txt:822
@@ -64209,7 +64331,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64470,56 +64592,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64530,19 +64676,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64554,43 +64700,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.is.po b/po/documentation.is.po
index 7fa76a9d51a7d38fccaa1c94a87a397ae88f7d64..fd84003ed68bce001d2d6cbb967638365211624c 100644
--- a/po/documentation.is.po
+++ b/po/documentation.is.po
@@ -4,10 +4,22 @@
 # Jean-No챘l AVILA <jn.avila@free.fr>, 2020.
 #
 msgid ""
-msgstr "Project-Id-Version: git-manpages-l 10n\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-05-17 17:03+0200\nPO-Revision-Date: 2021-06-09 17:32+0000\nLast-Translator: 횧처rhalla Gu챨mundsd처ttir Beck <plergux@outlook.com>\nLanguage-Team: Icelandic\nLanguage: is\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n % 10 != 1 || n % 100 == 11;\nX-Generator: Weblate 4.7-dev\n"
+msgstr ""
+"Project-Id-Version: git-manpages-l 10n\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
+"PO-Revision-Date: 2021-06-09 17:32+0000\n"
+"Last-Translator: 횧처rhalla Gu챨mundsd처ttir Beck <plergux@outlook.com>\n"
+"Language-Team: Icelandic\n"
+"Language: is\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n % 10 != 1 || n % 100 == 11;\n"
+"X-Generator: Weblate 4.7-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -67,7 +79,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -79,7 +91,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 msgid "-t"
 msgstr "-t"
@@ -115,7 +127,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -127,7 +139,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2808,7 +2820,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2842,139 +2854,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3858,13 +3870,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3951,33 +3963,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -3986,7 +3998,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4485,7 +4497,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4517,7 +4529,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4744,7 +4756,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4756,7 +4768,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5110,79 +5122,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5191,430 +5203,430 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--skip-to=<file>"
 msgstr "--pathspec-from-file=<skjal>"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--rotate-to=<file>"
 msgstr "--pathspec-from-file=<skjal>"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5752,55 +5764,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5808,397 +5838,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr "--upload-pack <upphalspakki>"
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "S첵na ferlisuppl첵singar."
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<valm철guleiki>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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 "Senda vi챨komandi textastreng til net첸j처nsins 첸egar samskiptin eru samkv챈mt samskiptareglum af ger챨 2. Vi챨komandi strengur m찼 ekki innihalda NUL (innihaldslaust) e챨a LF (l챠nuskipta-) t찼kn. Me챨fer챨 net첸j처nsins 찼 net첸j처nsvalm철guleikum, 첸ar me챨 tali챨 처첸ekktum valm철guleikum, er undir vef첸j처ninum komin. 횧egar margir `--server-option=<valm철guleiki>` (net첸j처nsvalm철guleikar) eru gefnir upp eru 첸eir sendir yfir 챠 첸eirri r철챨 sem 첸eir koma fyrir 챠 찼 skipanal챠nunni."
 
 #. type: Labeled list
-#: en/fetch-options.txt:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6286,13 +6316,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "Vinsamlegast sko챨i챨 linkgit:git-commit[1] fyrir a챨rar lei챨ir til 첸ess a챨 b챈ta innihaldi vi챨 innlegg."
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "VALM횜GULEIKAR"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr "<sl처챨atilgreining> ..."
@@ -6322,7 +6352,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr "Leyfa 첸a챨 a챨 b챈ta vi챨 skj철lum sem annars v챈ru hunsu챨."
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6352,13 +6382,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr "횧etta jafngildir a챨 einhverju leyti skipuninni `add --interactive` (b챈ta vi챨 gagnvirkt), en stekkur yfir upphafshluta skipunarinnar og fer beint 챠 undirskipunina `patch`(vi챨b챈tur). Sj찼 ``Gagnvirkt fyrirkomulag'' fyrir frekari uppl첵singar."
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6532,31 +6562,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr "Taka ekki tilliti til keyranlega hluta 첸eirra skjala sem b챈tt er vi챨. Keyranlegu hlutunum er einungis breytt 챠 atri챨askr찼nni, skj철lin 찼 diskdrifinu eru 처breytt 찼 eftir."
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<skjal>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr "Sl처챨atilgreiningar eru sendar til skipunarinnar 챠 `<skjal>` 챠 sta챨inn fyrir a챨 gera 첸a챨 me챨 breytum 찼 skipanal챠nunni. Ef `<skjal>` er n찼vk챈mlega `-` er sta챨al챠lag nota챨, 첸.e. 첸a챨 sem vi챨komandi forrit telur hef챨bundna 챠lagsa챨fer챨. S챕ratri챨i 챠 sl처챨atilgreiningaskr찼nni skal a챨skilja me챨 LF (almennu l챠nuendat찼kni) e챨a CR/LF (Windows l챠nuendat찼kni). H챈gt er a챨 setja s챕ratri챨i 챠 g챈salappir eins og 첬tsk첵rt er 챠 sambandi vi챨 stillingarbreytuna `core.quotePath`(tilv챠sun sl처챨ar 챠 kjarna) (sj찼 linkgit:git-config[1], git stillingar). Sj찼 einnig `--pathspec-file-nul` (ekkert skjal fyrir sl처챨artilgreiningu) og alt챈kar `--literal-pathspecs` (b처ksaflegar sl처챨atilgreiningar) stillingar."
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr "Hefur einungis merkingu me챨 `--pathspec-from-file` (sl처챨atilgreiningar 첬r skali). S챕ratri챨i sl처챨atilgreiningar eru a챨skild me챨 NUL (merkingarlaus) t찼kni og 철ll 철nnur t찼kn eru tekin b처kstaflega (첸ar me챨 talin n첵l챠nut찼kn og g챈salappir)."
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr "\\--"
@@ -6568,7 +6598,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr "H챈gt er a챨 nota 첸ennan valm철guleika til 첸ess a챨 a챨skilja valm철guleika skipanal챠nunnar fr찼 skjalalistanum (hj찼lplegt 첸egar skjalan철fn g챈tu veri챨 mistekin fyrir skipanal챠nuvalm철guleika)."
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "D횈MI"
@@ -6946,7 +6976,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr "A챨 breyta innihaldi l챠na sem eru til (\" \") e챨a 찼 a챨 fjarl챈gja (\"-\")"
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "SJ횁 EINNIG"
@@ -6958,13 +6988,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "Hluti af linkgit:git[1] fylkingunni"
@@ -7401,7 +7431,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7613,7 +7643,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7913,7 +7943,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8183,7 +8213,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8322,7 +8352,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12287,7 +12317,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12671,7 +12701,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14072,7 +14102,16 @@ msgid ""
 "\t  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
 "\t  [--filter=<filter>] [--] <repository>\n"
 "\t  [<directory>]\n"
-msgstr "'git clone' [--template=<sni챨m처tsskr찼>]\n\t  [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n\t  [-o <nafn>] [-b <nafn>] [-u <upphalspakki>] [--reference <hirsla>]\n\t  [--dissociate] [--separate-git-dir <git skr찼>]\n\t  [--depth <d첵pt>] [--[no-]single-branch] [--no-tags]\n\t  [--recurse-submodules[=<sl처챨atilgreining>]] [--[no-]shallow-submodules]\n\t  [--[no-]remote-submodules] [--jobs <n>] [--sparse][--[no-]reject-shallow]\n\t  [--filter=<s챠a>] [--] <hirsla>\n\t  [<skr찼>]\n"
+msgstr ""
+"'git clone' [--template=<sni챨m처tsskr찼>]\n"
+"\t  [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
+"\t  [-o <nafn>] [-b <nafn>] [-u <upphalspakki>] [--reference <hirsla>]\n"
+"\t  [--dissociate] [--separate-git-dir <git skr찼>]\n"
+"\t  [--depth <d첵pt>] [--[no-]single-branch] [--no-tags]\n"
+"\t  [--recurse-submodules[=<sl처챨atilgreining>]] [--[no-]shallow-submodules]\n"
+"\t  [--[no-]remote-submodules] [--jobs <n>] [--sparse][--[no-]reject-shallow]\n"
+"\t  [--filter=<s챠a>] [--] <hirsla>\n"
+"\t  [<skr찼>]\n"
 
 #. type: Plain text
 #: en/git-clone.txt:30
@@ -14093,7 +14132,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr "횧essi forstillta heg챨un f챈rst me챨 첸v챠 a챨 skapa tilv챠sanir til hausa fjarl챈gu greinanna undir `refs/remotes/origin` (tilv챠sanir fjarl챈gjur uppruni) og me챨 첸v챠 a챨 frumstilla stillingabreyturnar `remote.origin.url`(fjarl챈gja uppruni vefsl처챨) og `remote.origin.fetch`(fjarl챈gja uppruni s챈kja)."
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14156,7 +14195,16 @@ msgid ""
 "which automatically call `git maintenance run --auto`. (See\n"
 "linkgit:git-maintenance[1].) If these objects are removed and were referenced\n"
 "by the cloned repository, then the cloned repository will become corrupt.\n"
-msgstr "*ATHUGI횖*: 첸etta er m철gulega h챈ttuleg a챨ger챨; *ekki* nota\nhana nema 첸첬 vitir hva챨 h첬n gerir. Ef 첸첬 einritar hirsluna 첸챠na\nme챨 첸essum valm철guleika og ey챨ir s챠챨an greinum (e챨a notar einhverja\na챨ra Git skipun sem gerir 첸a챨 a챨 verkum a챨 tilv챠sanir 챠 innlegg sem eru til hverfa) 챠 \nupprunahirslunni, geta sum vi챨f철ng t첵nt tilv챠sunum s챠num (첸au lafa). \n횧essi vi챨f철ng er h챈gt a챨 fjarl챈gja me챨 venjulegum Git a챨ger챨um (svo sem `git commit`(git inlegg))\nsem sj찼lfkrafa kallar 찼 `git maintainance run --auto` (git vi챨hald sj찼lfkrafa). (Sj찼 linkgit:git-maintainance[1].)\nEf 첸essi vi챨f철ng eru fjarl챈g챨 og hafa tilv챠sun 챠 afritu챨u hirslunni \n첸찼 skrumsk챈list afrita챨a hirslan.\n"
+msgstr ""
+"*ATHUGI횖*: 첸etta er m철gulega h챈ttuleg a챨ger챨; *ekki* nota\n"
+"hana nema 첸첬 vitir hva챨 h첬n gerir. Ef 첸첬 einritar hirsluna 첸챠na\n"
+"me챨 첸essum valm철guleika og ey챨ir s챠챨an greinum (e챨a notar einhverja\n"
+"a챨ra Git skipun sem gerir 첸a챨 a챨 verkum a챨 tilv챠sanir 챠 innlegg sem eru til hverfa) 챠 \n"
+"upprunahirslunni, geta sum vi챨f철ng t첵nt tilv챠sunum s챠num (첸au lafa). \n"
+"횧essi vi챨f철ng er h챈gt a챨 fjarl챈gja me챨 venjulegum Git a챨ger챨um (svo sem `git commit`(git inlegg))\n"
+"sem sj찼lfkrafa kallar 찼 `git maintainance run --auto` (git vi챨hald sj찼lfkrafa). (Sj찼 linkgit:git-maintainance[1].)\n"
+"Ef 첸essi vi챨f철ng eru fjarl챈g챨 og hafa tilv챠sun 챠 afritu챨u hirslunni \n"
+"첸찼 skrumsk챈list afrita챨a hirslan.\n"
 
 #. type: Plain text
 #: en/git-clone.txt:94
@@ -14897,7 +14945,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -15003,7 +15051,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15133,7 +15181,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15145,7 +15193,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15856,557 +15904,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16469,14 +16511,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16487,7 +16541,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16497,7 +16551,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16507,7 +16561,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16517,7 +16571,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16529,157 +16583,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16689,13 +16743,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16708,19 +16762,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16728,13 +16782,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19370,103 +19424,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19474,25 +19528,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19500,13 +19554,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19514,7 +19568,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19522,13 +19576,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19536,37 +19590,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19596,19 +19650,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20196,7 +20250,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20378,13 +20432,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20393,110 +20447,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20505,31 +20565,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20538,31 +20598,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20571,31 +20631,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20604,31 +20664,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20636,19 +20696,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27847,7 +27907,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31292,373 +31352,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36763,7 +36823,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36779,7 +36839,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36983,7 +37043,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -37019,7 +37079,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37128,7 +37188,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37684,7 +37744,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38168,7 +38228,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43308,115 +43368,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44488,7 +44548,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46872,521 +46932,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
+#, priority:100
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47396,151 +47474,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47551,25 +47629,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47578,19 +47656,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49238,253 +49316,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49493,31 +49571,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49529,13 +49607,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49550,13 +49628,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49568,19 +49646,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49595,19 +49673,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49616,7 +49694,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51715,7 +51793,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57826,7 +57904,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58133,7 +58211,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -58326,7 +58404,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58803,7 +58881,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62476,194 +62554,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64242,7 +64356,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64503,56 +64617,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64563,19 +64701,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64587,43 +64725,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.it.po b/po/documentation.it.po
index 591467026df4814114f75e04c9c2e66aa5054750..c54f807dddfe6b31b97ffdfa106c790f1fe9d4fa 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: 2021-05-17 17:03+0200\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
 "PO-Revision-Date: 2021-01-19 16:32+0000\n"
 "Last-Translator: Lilian Wang <li330wang@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: Weblate 4.5-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -79,7 +79,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -91,7 +91,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 msgid "-t"
 msgstr "-t"
@@ -127,7 +127,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -139,7 +139,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2819,7 +2819,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2853,139 +2853,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3882,13 +3882,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr "Genera patch semplici senza differenze."
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3975,33 +3975,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -4010,7 +4010,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4509,7 +4509,7 @@ msgid "Synonym for `-p --stat`."
 msgstr "sinonimo di '-p --stat'"
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4543,7 +4543,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr "Senza questa opzione, i nomi dei percorsi con caratteri \"insoliti\" sono citati come spiegato per la variabile di configurazione `core.quotePath` (vedi linkgit: git-config [1])."
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4775,7 +4775,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, fuzzy, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "ignora modifiche agli spazi bianchi a fine riga"
@@ -4787,7 +4787,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, fuzzy, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr "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."
@@ -5153,79 +5153,79 @@ msgid "-l<num>"
 msgstr "-l<num>"
 
 #. type: Plain text
-#: en/diff-options.txt:596
-#, fuzzy, 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 "Le opzioni `-M` e` -C` richiedono il tempo di elaborazione O (n ^ 2) dove n 챔 il numero di potenziali destinazioni di rinomina / copia. Questa opzione impedisce l'esecuzione del rilevamento di rinomina / copia se il numero di destinazioni di rinomina / copia supera il numero specificato."
+#: en/diff-options.txt:602
+#, priority:280
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
+msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, fuzzy, 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 "Seleziona solo i file che vengono aggiunti (`A`), copiati (` C`), eliminati (`D`), modificati (` M`), rinominati (`R`), hanno il loro tipo (cio챔 file normale, link simbolico, sottomodulo, ...) modificato (`T`), sono Unmerged (` U`), sono Sconosciuto (`X`) o hanno avuto il loro accoppiamento Broken (` B`). 횊 possibile utilizzare qualsiasi combinazione di caratteri filtro (incluso nessuno). Quando `*` (Tutto-o-nessuno) viene aggiunto alla combinazione, vengono selezionati tutti i percorsi se esiste un file che corrisponde ad altri criteri nel confronto; se non esiste alcun file che soddisfi altri criteri, non viene selezionato nulla."
 
 #. type: Plain text
-#: en/diff-options.txt:612
+#: en/diff-options.txt:618
 #, fuzzy, priority:280
 msgid "Also, these upper-case letters can be downcased to exclude.  E.g.  `--diff-filter=ad` excludes added and deleted paths."
 msgstr "Inoltre, queste lettere maiuscole possono essere declassate per escludere. Per esempio. `--diff-filter = ad` esclude i percorsi aggiunti ed eliminati."
 
 #. type: Plain text
-#: en/diff-options.txt:618
+#: en/diff-options.txt:624
 #, fuzzy, 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 "Nota che non tutte le differenze possono presentare tutti i tipi. Ad esempio, le differenze dall'indice al worktree non possono mai avere voci aggiunte (perch챕 l'insieme di percorsi inclusi nel differenziale 챔 limitato da ci챵 che 챔 nell'indice). Allo stesso modo, le voci copiate e rinominate non possono apparire se il rilevamento per questi tipi 챔 disabilitato."
 
 #. type: Labeled list
-#: en/diff-options.txt:619
+#: en/diff-options.txt:625
 #, fuzzy, no-wrap, priority:280
 msgid "-S<string>"
 msgstr "<stringa>"
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, fuzzy, 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 "횊 utile quando stai cercando un blocco esatto di codice (come uno struct) e vuoi conoscere la cronologia di quel blocco dalla sua prima creazione: usa la funzione in modo iterativo per reinserire l'interessante blocco nel preimage in `-S`, e continua finch챕 non ottieni la prima versione del blocco."
 
 #. type: Plain text
-#: en/diff-options.txt:631
+#: en/diff-options.txt:637
 #, fuzzy, priority:280
 msgid "Binary files are searched as well."
 msgstr "Vengono cercati anche i file binari."
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, fuzzy, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr "<espressione regolare>"
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, fuzzy, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr "Cerca le differenze il cui testo di patch contiene righe aggiunte / rimosse che corrispondono a <regex>."
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5237,428 +5237,428 @@ msgstr ""
 "-    hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, fuzzy, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr "Mentre `git log -G\" frotz \\ (nitfol \"` mostrer횪 questo commit, `git log -S\" frotz \\ (nitfol \"--pickaxe-regex` non cambier횪 (perch챕 il numero di occorrenze di quella stringa non 챔 cambiato) ."
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, fuzzy, priority:280
 msgid "Unless `--text` is supplied patches of binary files without a textconv filter will be ignored."
 msgstr "A meno che non venga fornito `--text`, le patch di file binari senza un filtro textconv verranno ignorate."
 
 #. type: Plain text
-#: en/diff-options.txt:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, fuzzy, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr "--find-object=<object-id>"
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, fuzzy, 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 "Cerca le differenze che cambiano il numero di occorrenze dell'oggetto specificato. Simile a `-S`, solo l'argomento 챔 diverso in quanto non cerca una stringa specifica ma un ID di un oggetto specifico"
 
 #. type: Plain text
-#: en/diff-options.txt:664
+#: en/diff-options.txt:670
 #, fuzzy, 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 "L'oggetto pu챵 essere un BLOB o un commit del sottomodulo. Implica l'opzione `-t` in` git-log` per trovare anche alberi."
 
 #. type: Labeled list
-#: en/diff-options.txt:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, fuzzy, 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 "Quando `-S` o` -G` trovano una modifica, mostra tutte le modifiche in quel changeset, non solo i file che contengono la modifica in <string>."
 
 #. type: Labeled list
-#: en/diff-options.txt:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, fuzzy, priority:280
 msgid "Treat the <string> given to `-S` as an extended POSIX regular expression to match."
 msgstr "Considera <stringa> dato a `-S` come un'espressione regolare POSIX estesa da abbinare."
 
 #. type: Labeled list
-#: en/diff-options.txt:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, fuzzy, 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 "Controlla l'ordine in cui i file compaiono nell'output. Questo sovrascrive la variabile di configurazione `diff.orderFile` (vedi linkgit: git-config [1]). Per cancellare `diff.orderFile`, usa` -O / dev / null`."
 
 #. type: Plain text
-#: en/diff-options.txt:693
+#: en/diff-options.txt:699
 #, fuzzy, 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 "L'ordine di output 챔 determinato dall'ordine dei pattern glob in <orderfile>. Tutti i file con nomi di percorso che corrispondono al primo modello vengono emessi per primi, tutti i file con nomi di percorso che corrispondono al secondo motivo (ma non il primo) vengono emessi successivamente e cos챙 via. Tutti i file con nomi di percorso che non corrispondono a nessun pattern vengono stampati per ultimi, come se alla fine del file fosse presente un pattern match-all implicito. Se pi첫 percorsi hanno lo stesso rango (corrispondono allo stesso modello ma non a modelli precedenti), il loro ordine di output l'uno rispetto all'altro 챔 l'ordine normale."
 
 #. type: Plain text
-#: en/diff-options.txt:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, fuzzy, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr "Le righe vuote vengono ignorate, quindi possono essere utilizzate come separatori per la leggibilit횪."
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, fuzzy, priority:280
 msgid "Each other line contains a single pattern."
 msgstr "Ogni altra riga contiene un singolo modello."
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 msgid "--skip-to=<file>"
 msgstr "--output=<file>"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 msgid "--rotate-to=<file>"
 msgstr "--template=<file>"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, fuzzy, no-wrap, priority:280
 msgid "-R"
 msgstr "-R"
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, fuzzy, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr "--relative[=<path>]"
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, fuzzy, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr "Quando eseguito da una sottocartella del progetto, pu챵 essere detto di escludere le modifiche all'esterno della cartella e mostrare i percorsi relativi ad essa con questa opzione. Quando non ci si trova in una sottocartella (ad es. In un repository nudo), 챔 possibile assegnare un nome a quale aottocartellarendere l'output relativo fornendo un <path> come argomento."
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, fuzzy, priority:280
 msgid "Treat all files as text."
 msgstr "tratta tutti i file come se fossero di testo"
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, fuzzy, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr "Ignora gli spazi bianchi quando si confrontano le linee. Questo ignora le differenze anche se una riga ha spazi bianchi dove l'altra riga non ne ha."
 
 #. type: Labeled list
-#: en/diff-options.txt:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, fuzzy, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr "ignora modifiche che riguardano solo righe vuote"
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, fuzzy, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr "<espressione regolare>"
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, fuzzy, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr "Questa opzione pu챵 essere specificata pi첫 di una volta."
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, fuzzy, 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 "Mostra il contesto tra hunk diff, fino al numero specificato di linee, fondendo in tal modo hunk vicini l'uno all'altro. Il valore predefinito 챔 `diff.interHunkContext` o 0 se l'opzione di configurazione non 챔 impostata."
 
 #. type: Labeled list
-#: en/diff-options.txt:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, fuzzy, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr "Disabilita tutto l'output del programma. Implica `--exit-code`."
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, fuzzy, priority:280
 msgid "Disallow external diff drivers."
 msgstr "Non consentire driver diff esterni."
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, fuzzy, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr "--ignore-submodules[=<when>]"
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, fuzzy, 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 "Ignora le modifiche ai sottomoduli nella generazione diff. <when> pu챵 essere \"none\", \"untracked\", \"dirty\" o \"all\", che 챔 l'impostazione predefinita. L'uso di \"none\" considerer횪 il sottomodulo modificato quando contiene file non tracciati o modificati o il suo HEAD differisce dal commit registrato nel superprogetto e pu챵 essere usato per sovrascrivere qualsiasi impostazione dell'opzione 'ignore' in linkgit: git-config [1 ] o linkgit: gitmodules [5]. Quando si utilizza \"untracked\", i sottomoduli non sono considerati sporchi quando contengono solo contenuto non tracciato (ma sono ancora sottoposti a scansione per il contenuto modificato). L'uso di \"dirty\" ignora tutte le modifiche all'albero di lavoro dei sottomoduli, vengono mostrate solo le modifiche ai commit archiviati nel superprogetto (questo era il comportamento fino alla 1.7.0). L'uso di \"all\" nasconde tutte le modifiche ai sottomoduli."
 
 #. type: Labeled list
-#: en/diff-options.txt:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, fuzzy, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr "visualizza il prefisso sorgente specificato invece di \"a/\""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, fuzzy, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr "--dst-prefix=<prefix>"
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, fuzzy, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr "visualizza il prefisso destinazione specificato invece di \"b/\""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, fuzzy, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr "non visualizzare alcun prefisso sorgente o destinazione"
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, fuzzy, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr "--line-prefix=<prefix>"
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, fuzzy, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr "anteponi un prefisso aggiuntivo ad ogni riga dell'output"
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, fuzzy, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr "Per una spiegazione pi첫 dettagliata di queste opzioni comuni, vedere anche linkgit: gitdiffcore [7]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5796,55 +5796,74 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
-#, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+#: en/fetch-options.txt:68
+#, fuzzy, priority:220
+#| msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr "Vedere anche l'opzione di configurazione`fetch.negotiationAlgorithm`documentata in linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5852,397 +5871,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, fuzzy, priority:220
 msgid "Keep downloaded pack."
 msgstr "mantieni il pack scaricato"
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, fuzzy, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr "--upload-pack <upload-pack>"
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, fuzzy, priority:300
 msgid "Be verbose."
 msgstr "Sii dettagiato."
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, fuzzy, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<opzione>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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.  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 "Trasmettere le stringhe date al server quando si comunica usando il protocollo versione 2. LA stringa data non deve contenere un carattere NUL o LF. La gestione da parte del server delle opzioni del server, comprese quelle sconosciute, 챔 specifica del server. Quando multiple `--server-option=<option>`sono date, sono tutte inviate dall'altra parte nell'ordine listato sulla linea di comando."
 
 #. type: Labeled list
-#: en/fetch-options.txt:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6330,13 +6349,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "Prego vedere linkgit:git-commit[1] per madalit횪 alternative per aggiungere un contenuto al commit."
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, fuzzy, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OPZIONI"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, fuzzy, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr "<pathspec<"
@@ -6366,7 +6385,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr "consenti l'aggiunta di file altrimenti ignorati"
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6396,13 +6415,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6576,31 +6595,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr "Sovrascrivere il bit fattibili dei file aggiunti. Il bit fattibile viene cambiato solo nell'indice, i file nel disco rimangono invariati."
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, fuzzy, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr "Pathspec viene passato in `<file>` invece degli arg della riga di comando. Se `<file>` 챔 esattamente `-`, viene utilizzato l'input standard. Gli elementi pathspec vengono separati da LF o CR/LF. Gli elementi pathspec possono essere citati come spiegato per la variabile di configurazione `core.quotePath` (see linkgit:git-config[1]). Vedere anche `--pathspec-file-nul`  ed il `--literal-pathspecs` global."
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, fuzzy, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr "Importante solo con `--pathspec-from-file`. Gli elementi pathspec vengono separati con caratteru NUL e tutti gli altri caratteri vengono presi letteralmente (tra cui newline e citazioni)."
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, fuzzy, no-wrap, priority:300
 msgid "\\--"
 msgstr "\\--"
@@ -6612,7 +6631,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr "Questa opzione pu챵 essere usata per separare opzioni di comando di linea dalla lista dei file, (utile quando i nomi dei file potrebbero essere errati le opzioni del comando di linea)."
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, fuzzy, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "ESEMPI"
@@ -6990,7 +7009,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr "modificando i contenuti del contesto o rimuovere le linee."
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, fuzzy, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "VEDERE ANCHE"
@@ -7002,13 +7021,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, fuzzy, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, fuzzy, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "Parte del pacchetto linkgit:git[1]"
@@ -7446,7 +7465,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, fuzzy, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr "DISCUSSIONE"
@@ -7658,7 +7677,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7958,7 +7977,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, fuzzy, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr "CONFIGURAZIONE"
@@ -8228,7 +8247,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8366,7 +8385,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12329,7 +12348,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, fuzzy, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr "non visualizzare i messaggi di feedback"
@@ -12713,7 +12732,7 @@ msgid "Limits the paths affected by the operation."
 msgstr "Limita i percorsi interessati dall'operazione."
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14144,7 +14163,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr "Questa configurazione predefinita 챔 raggiunta creando richiami alle remote branche di testa sotto `refs/remotes/origin` ed inizializzando variabili di configurazione `remote.origin.url` e `remote.origin.fetch`."
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14956,7 +14975,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -15062,7 +15081,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, fuzzy, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr "Utilizzare l'interfaccia di selezione patch interattiva per scegliere quali modifiche eseguire. Vedi link git: git-add [1] per i dettagli."
 
 #. type: Labeled list
@@ -15192,7 +15211,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr "Quando si esegue una prova a secco, fornire l'output in un formato porcelain-ready. Vedi linkgit: git-status [1] per i dettagli. Implica `--dry-run`."
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15204,7 +15223,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15918,557 +15937,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16531,14 +16544,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16549,7 +16574,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16559,7 +16584,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16569,7 +16594,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16579,7 +16604,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16591,157 +16616,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16751,13 +16776,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16770,19 +16795,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16790,13 +16815,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19432,103 +19457,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, fuzzy, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr "cerca corrispondenze con <pattern>"
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, fuzzy, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr "visualizza l'oggetto commit abbreviato come fallback"
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19536,25 +19561,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19562,13 +19587,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19576,7 +19601,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19584,13 +19609,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19598,37 +19623,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19658,19 +19683,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20258,7 +20283,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20440,14 +20465,14 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
-msgstr ""
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
+msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
 
 #. type: Plain text
 #: en/git-diff.txt:64
@@ -20455,110 +20480,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, 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:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, 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:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20567,31 +20598,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20600,31 +20631,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20633,31 +20664,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20666,31 +20697,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20698,19 +20729,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27912,7 +27943,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31354,373 +31385,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, fuzzy, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr "linkgit:git-shortlog[1]."
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36830,7 +36861,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36846,7 +36877,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -37050,7 +37081,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -37086,7 +37117,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37195,7 +37226,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37750,9 +37781,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-pull.txt:121
-#, priority:220
-msgid "When false, merge the current branch into the upstream branch."
-msgstr ""
+#, fuzzy, priority:220
+msgid "When false, merge the upstream branch into the current branch."
+msgstr "Applica un insieme di patch quilt sul branch corrente"
 
 #. type: Plain text
 #: en/git-pull.txt:123
@@ -38235,7 +38266,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43377,115 +43408,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44558,7 +44589,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46942,521 +46973,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47466,151 +47515,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47621,25 +47670,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47648,19 +47697,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49311,253 +49360,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, 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:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, 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:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, fuzzy, no-wrap, priority:240
 msgid "store"
 msgstr "punteggio"
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49566,31 +49615,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49602,13 +49651,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49623,13 +49672,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49641,19 +49690,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49668,19 +49717,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49689,7 +49738,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51788,7 +51837,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57905,7 +57954,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58211,9 +58260,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-worktree.txt:246
-#, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
-msgstr ""
+#, fuzzy, priority:240
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
+msgstr "Ripristina i file nell'albero di lavoro"
 
 #. type: Labeled list
 #: en/git-worktree.txt:247
@@ -58405,7 +58454,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58883,7 +58932,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62563,194 +62612,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64328,7 +64413,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64589,56 +64674,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64649,19 +64758,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64673,43 +64782,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
@@ -67212,6 +67321,10 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 
+#, fuzzy
+#~ 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 "Le opzioni `-M` e` -C` richiedono il tempo di elaborazione O (n ^ 2) dove n 챔 il numero di potenziali destinazioni di rinomina / copia. Questa opzione impedisce l'esecuzione del rilevamento di rinomina / copia se il numero di destinazioni di rinomina / copia supera il numero specificato."
+
 #, fuzzy, no-wrap
 #~ msgid "--no-diff-merges:"
 #~ msgstr "--no-diff-merges"
diff --git a/po/documentation.ja.po b/po/documentation.ja.po
index de1ff94565c1044b9ef0760922c6c7388902258d..ab44aa68883c5e572358f2e1d75e693732131182 100644
--- a/po/documentation.ja.po
+++ b/po/documentation.ja.po
@@ -4,10 +4,22 @@
 # Jean-No챘l AVILA <jn.avila@free.fr>, 2020.
 #
 msgid ""
-msgstr "Project-Id-Version: git-manpages-l 10n\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-05-17 17:03+0200\nPO-Revision-Date: 2021-06-29 18:33+0000\nLast-Translator: hino-ryu <ms_kinjo@outlook.jp>\nLanguage-Team: Japanese\nLanguage: ja\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.7.1-dev\n"
+msgstr ""
+"Project-Id-Version: git-manpages-l 10n\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
+"PO-Revision-Date: 2021-06-29 18:33+0000\n"
+"Last-Translator: hino-ryu <ms_kinjo@outlook.jp>\n"
+"Language-Team: Japanese\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.7.1-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -69,8 +81,8 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
-#, fuzzy, ignore-same, no-wrap, priority:300
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
 
@@ -81,7 +93,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 msgid "-t"
 msgstr "-t"
@@ -117,7 +129,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -129,7 +141,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2810,7 +2822,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2844,139 +2856,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3860,13 +3872,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3953,33 +3965,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -3988,7 +4000,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4487,7 +4499,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4519,7 +4531,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4746,7 +4758,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4758,7 +4770,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5112,79 +5124,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5193,430 +5205,430 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--skip-to=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--rotate-to=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5754,55 +5766,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
+#, priority:220
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5810,397 +5840,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, fuzzy, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr "--upload-pack <upload-pack>"
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "屋녕눗�뚩〃鹽뷩걬�뚣겲�쇻��"
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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 "�꿱죱�뜻퀋����-q �뚧뙁若싥걬�뚣겍�꾠겒�꾦솏�듽�곭ク�ャ겓�η텥�뺛굦�╉걚�뗣겏�띲겓�뉎깢�⒲꺂�덀겎與숁틬�ⓦ꺀�쇈궧�덀꺁�쇈깲�㎩젿�듽걬�뚣겲�쇻�귙걪��깢�⒲궛���곫쮽繹뽧궓�⒲꺖�밤깉�ゃ꺖�졼걣塋�쑌�ラ�곦에�뺛굦�ゃ걚�닷릦�㎯굚�곲�꿱죱�뜻퀋�믣섭�뜰걮�얇걲��"
 
 #. type: Labeled list
-#: en/fetch-options.txt:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, fuzzy, no-wrap, priority:220
 msgid "-o <option>"
 msgstr "-o <option>"
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, fuzzy, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<option>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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 "�쀣꺆�덀궠�ャ깘�쇈궦�㎯꺍2�믢슴�ⓦ걮���싦에�쇻굥�ⓦ걤�ャ�곫뙁若싥걬�뚣걼�뉐춻�쀣굮�듐꺖�먦꺖�ラ�곦에�쀣겲�쇻�귝뙁若싥걬�뚣걼�뉐춻�쀣겓���갢UL �얇걼�� LF �뉐춻�믣맜�곥굥�볝겏��겎�띲겲�쎼굯�귚툖�롢겒�ゃ깤�룔깾�녈굮�ャ��듐꺖�먦꺖�ゃ깤�룔깾�녈겗�듐꺖�먦꺖��눇�녴겘�곥궢�쇈깘�쇔쎓�됥겎�쇻�귟쨭�겹겗  `--server-option=<option>` �뚧뙁若싥걬�뚣겍�꾠굥�닷릦�곥걹�뚣굢��걲�밤겍�녈깯�녈깋�⒲궎�녈겓�ゃ궧�덀걬�뚣겍�꾠굥�녶틣�㎩룏野얍겢�ラ�곦에�뺛굦�얇걲��"
 
 #. type: Labeled list
-#: en/fetch-options.txt:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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 "�뉎깢�⒲꺂�덀겎���갾it ��깢�㎯긿�곦릎�ャ깣�⒲꺍�곥걣凉룟댍�꾠겓�닸뼭�뺛굦�뗣걢�⒲걝�뗣굮�곥궒�껁궚�쀣겲�쇻�� �볝굦�� fetch.showForcedUpdates �㎫꽒�밤겓�㎯걤�얇걲�뚣��--show-forced-updates �ゃ깤�룔깾�녈겘�볝겗�곥궒�껁궚�뚩죱�뤵굦�뗣걪�ⓦ굮岳앲㉫�쀣겲�쇻�굃inkgit:git-config[1] �믣뢿�㎯걮�╉걦�졼걬�꾠��"
 
 #. type: Labeled list
-#: en/fetch-options.txt:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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 "�뉎깢�⒲꺂�덀겎���갾it ��깢�㎯긿�곦릎�ャ깣�⒲꺍�곥걣凉룟댍�꾠겓�㏂긿�쀣깈�쇈깉�뺛굦�뗣걢�⒲걝�뗣굮�곥궒�껁궚�쀣겲�쇻��--no-show-forced-updates �믤륫�쇻걢�갽etch.showForcedUpdates �� false �ヨÞ若싥걮�╉�곥깙�뺛궔�쇈깯�녈궧訝듽겗�녺뵳�뗣굢�볝겗�곥궒�껁궚�믡궧��긿�쀣걮�얇걲��'git-pull' 訝�겓鵝욜뵪�쀣걼�닷릦��--ff-only �ゃ깤�룔깾�녈겘�갽ast-forward �㏂긿�쀣깈�쇈깉�믦ij�욍굥�띲겓�곩섭�뜰궋�껁깤�뉎꺖�덀굮�곥궒�껁궚�쀣겲�쇻�굃inkgit:git-config[1] �믣뢿�㎯걮�╉걦�졼걬�꾠��"
 
 #. type: Labeled list
-#: en/fetch-options.txt:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr "IPv6 �㏂깋�с궧�믥꽒誤뽧걮�╉�갏Pv4 �㏂깋�с궧��겳�믢슴�ⓦ걮�얇걲��"
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr "IPv4 �㏂깋�с궧�믥꽒誤뽧걮�╉�갏Pv6 �㏂깋�с궧��겳�믢슴�ⓦ걮�얇걲��"
@@ -6283,13 +6313,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr ""
@@ -6319,7 +6349,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6349,13 +6379,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6529,31 +6559,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr ""
@@ -6565,7 +6595,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6919,7 +6949,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6931,13 +6961,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7374,7 +7404,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7586,7 +7616,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7886,7 +7916,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8156,7 +8186,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8294,7 +8324,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12255,7 +12285,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12639,7 +12669,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14061,7 +14091,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14853,7 +14883,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14959,7 +14989,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15089,7 +15119,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15101,7 +15131,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15812,557 +15842,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16425,14 +16449,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16443,7 +16479,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16453,7 +16489,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16463,7 +16499,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16473,7 +16509,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16485,157 +16521,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16645,13 +16681,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16664,19 +16700,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16684,13 +16720,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19326,103 +19362,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19430,25 +19466,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19456,13 +19492,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19470,7 +19506,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19478,13 +19514,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19492,37 +19528,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19552,19 +19588,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20152,7 +20188,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20334,13 +20370,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20349,110 +20385,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20461,31 +20503,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20494,31 +20536,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20527,31 +20569,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20560,31 +20602,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20592,19 +20634,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, 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], linkgit:git-show[1]"
 msgstr ""
@@ -27806,7 +27848,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31241,373 +31283,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -32840,7 +32882,10 @@ msgid ""
 "\t o---o---o---B\n"
 "\t/\n"
 "---o---1---o---o---o---A\n"
-msgstr "\t o---o---o---B\n\t/\n---o---1---o---o---o---A\n"
+msgstr ""
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
 
 #. type: Plain text
 #: en/git-merge-base.txt:90
@@ -32863,7 +32908,12 @@ msgid ""
 "     /   o---o---o---B\n"
 "    /   /\n"
 "---2---1---o---o---o---A\n"
-msgstr "       o---o---o---o---C\n      /\n     /   o---o---o---B\n    /   /\n---2---1---o---o---o---A\n"
+msgstr ""
+"       o---o---o---o---C\n"
+"      /\n"
+"     /   o---o---o---B\n"
+"    /   /\n"
+"---2---1---o---o---o---A\n"
 
 #. type: Plain text
 #: en/git-merge-base.txt:105
@@ -32880,7 +32930,12 @@ msgid ""
 "     /   o---o---o---o---M\n"
 "    /   /\n"
 "---2---1---o---o---o---A\n"
-msgstr "       o---o---o---o---o\n      /                 \\\n     /   o---o---o---o---M\n    /   /\n---2---1---o---o---o---A\n"
+msgstr ""
+"       o---o---o---o---o\n"
+"      /                 \\\n"
+"     /   o---o---o---o---M\n"
+"    /   /\n"
+"---2---1---o---o---o---A\n"
 
 #. type: Plain text
 #: en/git-merge-base.txt:118
@@ -32909,7 +32964,12 @@ msgid ""
 "     X\n"
 "    / \\\n"
 "---2---o---o---B\n"
-msgstr "---1---o---A\n    \\ /\n     X\n    / \\\n---2---o---o---B\n"
+msgstr ""
+"---1---o---A\n"
+"    \\ /\n"
+"     X\n"
+"    / \\\n"
+"---2---o---o---B\n"
 
 #. type: Plain text
 #: en/git-merge-base.txt:136
@@ -36712,7 +36772,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36728,7 +36788,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36932,7 +36992,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -36968,7 +37028,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37077,7 +37137,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37633,7 +37693,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38117,7 +38177,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -41819,7 +41879,10 @@ msgid ""
 "\t3\n"
 "       /\n"
 "1 --- 2 --- 4 --- 5\n"
-msgstr "\t3\n       /\n1 --- 2 --- 4 --- 5\n"
+msgstr ""
+"\t3\n"
+"       /\n"
+"1 --- 2 --- 4 --- 5\n"
 
 #. type: Title =
 #: en/git-receive-pack.txt:2
@@ -43257,115 +43320,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44437,7 +44500,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46821,521 +46884,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
+#, priority:100
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47345,151 +47426,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47500,25 +47581,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47527,19 +47608,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49186,253 +49267,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49441,31 +49522,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49477,13 +49558,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49498,13 +49579,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49516,19 +49597,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49543,19 +49624,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49564,7 +49645,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51663,7 +51744,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57773,7 +57854,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58080,7 +58161,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -58273,7 +58354,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58750,7 +58831,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62423,194 +62504,237 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t o---o---o---B\n"
+#| "\t/\n"
+#| "---o---1---o---o---o---A\n"
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64188,7 +64312,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64449,56 +64573,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64509,19 +64657,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64533,43 +64681,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
@@ -66752,7 +66900,10 @@ msgid ""
 "      (BBC+BFC)-X1'-X2'-X3'-X4'-X5'-X6'-Z'\n"
 "     /\n"
 "...-Y-BBC-X1-X2-X3-X4-X5-X6-BFC-Z-...\n"
-msgstr "      (BBC+BFC)-X1'-X2'-X3'-X4'-X5'-X6'-Z'\n     /\n...-Y-BBC-X1-X2-X3-X4-X5-X6-BFC-Z-...\n"
+msgstr ""
+"      (BBC+BFC)-X1'-X2'-X3'-X4'-X5'-X6'-Z'\n"
+"     /\n"
+"...-Y-BBC-X1-X2-X3-X4-X5-X6-BFC-Z-...\n"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1160
@@ -66839,7 +66990,10 @@ msgid ""
 "      (BBC+BFC)-X1'-X2'-X3'-X4'-X5'-X6'-Z'-...\n"
 "     /\n"
 "...-Y-BBC-X1-X2-X3-X4-X5-X6-BFC-Z\n"
-msgstr "      (BBC+BFC)-X1'-X2'-X3'-X4'-X5'-X6'-Z'-...\n     /\n...-Y-BBC-X1-X2-X3-X4-X5-X6-BFC-Z\n"
+msgstr ""
+"      (BBC+BFC)-X1'-X2'-X3'-X4'-X5'-X6'-Z'-...\n"
+"     /\n"
+"...-Y-BBC-X1-X2-X3-X4-X5-X6-BFC-Z\n"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1225
diff --git a/po/documentation.ko.po b/po/documentation.ko.po
index 1183b4bbee28f619dbe3cf20e90cc9801febaef4..54fb9e39b723a94868e96ce565339ef1b16ac446 100644
--- a/po/documentation.ko.po
+++ b/po/documentation.ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-manpages-l10n\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2021-05-17 17:03+0200\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
 "PO-Revision-Date: 2020-08-18 02:32+0000\n"
 "Last-Translator: JunYeong Park <dahuin000@gmail.com>\n"
 "Language-Team: Korean\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: Weblate 4.2-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -79,7 +79,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -91,7 +91,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 msgid "-t"
 msgstr "-t"
@@ -127,7 +127,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -139,7 +139,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2820,7 +2820,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2854,139 +2854,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3870,13 +3870,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3963,33 +3963,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -3998,7 +3998,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4497,7 +4497,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4529,7 +4529,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4756,7 +4756,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4768,7 +4768,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5122,79 +5122,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5203,428 +5203,428 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, no-wrap, priority:280
 msgid "--skip-to=<file>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, no-wrap, priority:280
 msgid "--rotate-to=<file>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5762,55 +5762,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5818,397 +5836,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, fuzzy, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr "--upload-pack <upload-pack>"
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "濡쒓렇瑜� �쒖떆�섍쾶 �⑸땲��."
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<option>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6296,13 +6314,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr ""
@@ -6332,7 +6350,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6362,13 +6380,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6542,31 +6560,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr ""
@@ -6578,7 +6596,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6932,7 +6950,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6944,13 +6962,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7388,7 +7406,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7600,7 +7618,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7900,7 +7918,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8170,7 +8188,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8308,7 +8326,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12274,7 +12292,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12658,7 +12676,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14080,7 +14098,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14873,7 +14891,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14979,7 +14997,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15109,7 +15127,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15121,7 +15139,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15832,557 +15850,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16445,14 +16457,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16463,7 +16487,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16473,7 +16497,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16483,7 +16507,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16493,7 +16517,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16505,157 +16529,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16665,13 +16689,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16684,19 +16708,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16704,13 +16728,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19346,103 +19370,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19450,25 +19474,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19476,13 +19500,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19490,7 +19514,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19498,13 +19522,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19512,37 +19536,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19572,19 +19596,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20172,7 +20196,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20354,13 +20378,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20369,110 +20393,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20481,31 +20511,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20514,31 +20544,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20547,31 +20577,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20580,31 +20610,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20612,19 +20642,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27823,7 +27853,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31260,373 +31290,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36733,7 +36763,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36749,7 +36779,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36953,7 +36983,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -36989,7 +37019,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37098,7 +37128,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37654,7 +37684,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38138,7 +38168,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43281,115 +43311,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44461,7 +44491,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46845,521 +46875,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47369,151 +47417,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47524,25 +47572,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47551,19 +47599,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49210,253 +49258,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49465,31 +49513,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49501,13 +49549,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49522,13 +49570,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49540,19 +49588,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49567,19 +49615,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49588,7 +49636,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51687,7 +51735,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57798,7 +57846,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58105,7 +58153,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -58298,7 +58346,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58775,7 +58823,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62449,194 +62497,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64214,7 +64298,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64475,56 +64559,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64535,19 +64643,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64559,43 +64667,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.mr.po b/po/documentation.mr.po
index 59ba762eed35780a67b782fabdfeafec04675385..9312d94b1d9cfc8764ca0737c3d319b3901ecb65 100644
--- a/po/documentation.mr.po
+++ b/po/documentation.mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-manpages-l 10n\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2021-05-17 17:03+0200\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
 "PO-Revision-Date: 2020-11-26 19:29+0000\n"
 "Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
 "Language-Team: Marathi\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: Weblate 4.4-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -79,7 +79,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -91,7 +91,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 msgid "-t"
 msgstr "-t"
@@ -127,7 +127,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -139,7 +139,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2820,7 +2820,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2854,139 +2854,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3870,13 +3870,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3963,33 +3963,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -3998,7 +3998,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4497,7 +4497,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4529,7 +4529,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4756,7 +4756,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4768,7 +4768,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5122,79 +5122,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5203,428 +5203,428 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, no-wrap, priority:280
 msgid "--skip-to=<file>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, no-wrap, priority:280
 msgid "--rotate-to=<file>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5762,55 +5762,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5818,397 +5836,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr "--upload-pack <upload-pack>"
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "西듀ㅀ誓띭ㄼ誓뗠쩂 西듀쪓西밝ㅎ."
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<option>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6291,13 +6309,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "西むㅀ誓띭ㄿ西약ㄿ"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr "<pathspec> ..."
@@ -6327,7 +6345,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr "西╆쪇西겯쪓西꿋쨻誓띭ㅇ 西뺖쪍西꿋쪍西꿋쪓西�ㅎ 西ムㅎ西�ㅂ誓� 西쒉쪑西□ㄳ誓띭ㄿ西약쩀誓� 西むㅀ西듀ㅎ西ⓣ쨽誓� 西╆쪓西�ㅎ."
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6357,13 +6375,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6537,31 +6555,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr ""
@@ -6573,7 +6591,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6927,7 +6945,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6939,13 +6957,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7383,7 +7401,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7595,7 +7613,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7895,7 +7913,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8165,7 +8183,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8303,7 +8321,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12269,7 +12287,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12653,7 +12671,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14075,7 +14093,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14868,7 +14886,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14974,7 +14992,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15104,7 +15122,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15116,7 +15134,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15827,557 +15845,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16440,14 +16452,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16458,7 +16482,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16468,7 +16492,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16478,7 +16502,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16488,7 +16512,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16500,157 +16524,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16660,13 +16684,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16679,19 +16703,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16699,13 +16723,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19341,103 +19365,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19445,25 +19469,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19471,13 +19495,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19485,7 +19509,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19493,13 +19517,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19507,37 +19531,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19567,19 +19591,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20167,7 +20191,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20349,13 +20373,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20364,110 +20388,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20476,31 +20506,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20509,31 +20539,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20542,31 +20572,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20575,31 +20605,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20607,19 +20637,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27818,7 +27848,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31255,373 +31285,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36728,7 +36758,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36744,7 +36774,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36948,7 +36978,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -36984,7 +37014,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37093,7 +37123,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37649,7 +37679,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38133,7 +38163,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43276,115 +43306,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44456,7 +44486,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46840,521 +46870,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47364,151 +47412,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47519,25 +47567,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47546,19 +47594,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49205,253 +49253,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49460,31 +49508,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49496,13 +49544,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49517,13 +49565,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49535,19 +49583,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49562,19 +49610,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49583,7 +49631,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51682,7 +51730,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57793,7 +57841,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58100,7 +58148,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -58293,7 +58341,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58771,7 +58819,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62449,194 +62497,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64214,7 +64298,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64475,56 +64559,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64535,19 +64643,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64559,43 +64667,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index c67ffff20245839b7322bc572def7a24a25eeb77..2a737e3d7a261303327c2532ae3c9cbb44a24107 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: 2021-05-17 17:03+0200\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -74,7 +74,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -86,7 +86,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 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:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -134,7 +134,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2818,7 +2818,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2852,139 +2852,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3868,13 +3868,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3961,33 +3961,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -3996,7 +3996,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4495,7 +4495,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4527,7 +4527,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4754,7 +4754,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4766,7 +4766,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5120,79 +5120,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5201,430 +5201,430 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-removal"
 msgid "--skip-to=<file>"
 msgstr "--ignore-removal"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-removal"
 msgid "--rotate-to=<file>"
 msgstr "--ignore-removal"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5762,55 +5762,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5818,397 +5836,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6291,13 +6309,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr ""
@@ -6327,7 +6345,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6357,13 +6375,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6537,32 +6555,32 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, fuzzy, no-wrap, priority:300
 #| msgid "--ignore-removal"
 msgid "--pathspec-from-file=<file>"
 msgstr "--ignore-removal"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr ""
@@ -6574,7 +6592,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6928,7 +6946,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6940,13 +6958,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7384,7 +7402,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7596,7 +7614,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7896,7 +7914,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8166,7 +8184,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8305,7 +8323,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12271,7 +12289,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12655,7 +12673,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14077,7 +14095,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14870,7 +14888,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14976,7 +14994,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15106,7 +15124,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15118,7 +15136,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15829,557 +15847,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16442,14 +16454,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16460,7 +16484,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16470,7 +16494,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16480,7 +16504,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16490,7 +16514,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16502,157 +16526,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16662,13 +16686,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16681,19 +16705,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16701,13 +16725,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19343,103 +19367,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19447,25 +19471,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19473,13 +19497,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19487,7 +19511,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19495,13 +19519,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19509,37 +19533,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19569,19 +19593,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20169,7 +20193,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20351,13 +20375,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20366,110 +20390,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20478,31 +20508,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20511,31 +20541,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20544,31 +20574,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20577,31 +20607,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20609,19 +20639,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27825,7 +27855,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31262,373 +31292,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36735,7 +36765,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36751,7 +36781,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36955,7 +36985,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -36991,7 +37021,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37100,7 +37130,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37656,7 +37686,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38140,7 +38170,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43284,115 +43314,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44465,7 +44495,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46850,521 +46880,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47374,151 +47422,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47529,25 +47577,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47556,19 +47604,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49215,253 +49263,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49470,31 +49518,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49506,13 +49554,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49527,13 +49575,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49545,19 +49593,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49572,19 +49620,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49593,7 +49641,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51693,7 +51741,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57811,7 +57859,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58118,7 +58166,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -58311,7 +58359,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58789,7 +58837,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62483,194 +62531,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64248,7 +64332,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64509,56 +64593,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64569,19 +64677,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64593,43 +64701,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.nl.po b/po/documentation.nl.po
index 4b6407825c368027829fcd660909d3cdb1d763b5..99671410a3be81de68c8ce31c0f7f08850e0ff08 100644
--- a/po/documentation.nl.po
+++ b/po/documentation.nl.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: 2021-05-17 17:03+0200\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
 "PO-Revision-Date: 2020-08-07 23:32+0000\n"
 "Last-Translator: Karel Vanhelden <karelvanhelden@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Weblate 4.2-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -78,7 +78,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -90,7 +90,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 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:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -138,7 +138,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2819,7 +2819,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2853,139 +2853,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3869,13 +3869,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3962,33 +3962,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -3997,7 +3997,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4496,7 +4496,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4528,7 +4528,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4755,7 +4755,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4767,7 +4767,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5121,79 +5121,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5202,430 +5202,430 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 #| msgid "--show-number"
 msgid "--skip-to=<file>"
 msgstr "--show-number"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 #| msgid "--full-name"
 msgid "--rotate-to=<file>"
 msgstr "--full-name"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-date"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-date"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5763,55 +5763,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5819,397 +5837,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6292,13 +6310,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OPTIES"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr ""
@@ -6328,7 +6346,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6358,13 +6376,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6538,31 +6556,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr "\\--"
@@ -6574,7 +6592,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "VOORBEELDEN"
@@ -6935,7 +6953,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6947,13 +6965,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7391,7 +7409,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7603,7 +7621,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7903,7 +7921,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8173,7 +8191,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8312,7 +8330,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12278,7 +12296,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12662,7 +12680,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14084,7 +14102,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14877,7 +14895,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14983,7 +15001,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15113,7 +15131,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15125,7 +15143,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15836,557 +15854,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16449,14 +16461,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16467,7 +16491,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16477,7 +16501,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16487,7 +16511,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16497,7 +16521,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16509,157 +16533,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16669,13 +16693,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16688,19 +16712,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16708,13 +16732,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19350,103 +19374,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19454,25 +19478,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19480,13 +19504,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19494,7 +19518,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19502,13 +19526,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19516,37 +19540,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19576,19 +19600,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20176,7 +20200,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20358,13 +20382,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20373,110 +20397,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20485,31 +20515,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20518,31 +20548,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20551,31 +20581,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20584,31 +20614,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20616,19 +20646,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27831,7 +27861,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31271,373 +31301,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36744,7 +36774,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36760,7 +36790,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36964,7 +36994,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -37000,7 +37030,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37109,7 +37139,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37668,7 +37698,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38155,7 +38185,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43315,116 +43345,116 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, fuzzy, no-wrap, priority:100
 #| msgid "--unpack-unreachable"
 msgid "--unpack-unreachable=<when>"
 msgstr "--unpack-unreachable"
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44504,7 +44534,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46906,523 +46936,541 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, fuzzy, no-wrap, priority:100
 #| msgid "--preserve-user"
 msgid "--smtp-user=<user>"
 msgstr "--preserve-user"
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, fuzzy, no-wrap, priority:100
 #| msgid "--score-debug"
 msgid "--smtp-debug=0|1"
 msgstr "--score-debug"
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47432,152 +47480,152 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, fuzzy, no-wrap, priority:100
 #| msgid "--show-email"
 msgid "sendmail"
 msgstr "--show-email"
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47588,25 +47636,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47615,19 +47663,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, fuzzy, priority:100
 #| msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
@@ -49284,254 +49332,254 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, fuzzy, no-wrap, priority:240
 #| msgid "--start"
 msgid "<stash>"
 msgstr "--start"
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49540,31 +49588,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49576,13 +49624,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49597,13 +49645,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49615,19 +49663,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49642,19 +49690,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49663,7 +49711,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51779,7 +51827,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57925,7 +57973,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58234,7 +58282,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -58428,7 +58476,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58907,7 +58955,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62605,194 +62653,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64384,7 +64468,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64646,56 +64730,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64706,19 +64814,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64730,43 +64838,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.pl.po b/po/documentation.pl.po
index 0a180c59192573cb46f0ff45857f632b4968d361..7f9cb077d6c7c549ab9266b2aa8a81c17a4fd423 100644
--- a/po/documentation.pl.po
+++ b/po/documentation.pl.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: 2021-05-17 17:03+0200\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
 "PO-Revision-Date: 2020-04-23 20:24+0000\n"
 "Last-Translator: Michal Biesiada <blade-14@o2.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Weblate 4.0.2-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -78,7 +78,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -90,7 +90,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 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:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -138,7 +138,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2819,7 +2819,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2853,139 +2853,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3869,13 +3869,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3962,33 +3962,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -3997,7 +3997,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4496,7 +4496,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4528,7 +4528,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4755,7 +4755,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4767,7 +4767,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5121,79 +5121,79 @@ msgid "-l<num>"
 msgstr "-l<num>"
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, fuzzy, no-wrap, priority:280
 msgid "-S<string>"
 msgstr "-S<string>"
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, fuzzy, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr "-G<regex>"
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5202,430 +5202,430 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--skip-to=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--rotate-to=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, fuzzy, no-wrap, priority:280
 msgid "-R"
 msgstr "-R"
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, fuzzy, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr "-G<regex>"
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, fuzzy, no-wrap, priority:280
 msgid "-W"
 msgstr "-W"
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5763,55 +5763,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5819,397 +5837,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "B훳d탄 gadatliwy."
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<parametr>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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 "Przeka탉 podany ci훳g do serwera podczas komunikacji przy u탉yciu protoko흢u w wersji 2. Podany ci훳g nie mo탉e zawiera훶 znaku NUL lub LF.  Serwer obs흢uguje parametry serwera, w tym nieznane opcje, specyficzne dla niego. Po podaniu wielu opcji `--server-option = <option>`, wszystkie s훳 wysy흢ane na drug훳 stron휌 w kolejno힄ci podanej w wierszu polece흦."
 
 #. type: Labeled list
-#: en/fetch-options.txt:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6297,13 +6315,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OPCJE"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr ""
@@ -6333,7 +6351,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6363,13 +6381,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6543,31 +6561,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr "\\--"
@@ -6579,7 +6597,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "PRZYK흟ADY"
@@ -6933,7 +6951,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "ZOBACZ TAK탈E"
@@ -6945,13 +6963,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7389,7 +7407,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr "DYSKUSJA"
@@ -7601,7 +7619,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7901,7 +7919,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr "KONFIGURACJA"
@@ -8171,7 +8189,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8310,7 +8328,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12276,7 +12294,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12660,7 +12678,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14082,7 +14100,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14878,7 +14896,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr "PLIKI"
@@ -14984,7 +15002,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15114,7 +15132,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15126,7 +15144,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15842,557 +15860,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16455,14 +16467,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16473,7 +16497,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16483,7 +16507,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16493,7 +16517,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16503,7 +16527,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16515,157 +16539,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16675,13 +16699,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16694,19 +16718,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16714,13 +16738,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19356,103 +19380,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19460,25 +19484,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19486,13 +19510,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19500,7 +19524,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19508,13 +19532,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19522,37 +19546,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19582,19 +19606,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20182,7 +20206,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20364,13 +20388,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20379,110 +20403,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, fuzzy, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20494,31 +20524,31 @@ msgstr ""
 "$ git diff HEAD       <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20527,31 +20557,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20560,31 +20590,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20593,31 +20623,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20625,19 +20655,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27839,7 +27869,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31276,374 +31306,374 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, fuzzy, no-wrap, priority:260
 #| msgid "CONFIGURATION"
 msgid "DIFF FORMATTING"
 msgstr "KONFIGURACJA"
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, fuzzy, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr "`git log -L '/int main/',/^}/:main.c`"
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, fuzzy, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr "`git log -3`"
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36750,7 +36780,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36766,7 +36796,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36970,7 +37000,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -37006,7 +37036,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37115,7 +37145,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37671,7 +37701,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38157,7 +38187,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43329,115 +43359,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44510,7 +44540,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46894,521 +46924,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47418,151 +47466,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47573,25 +47621,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47600,19 +47648,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49259,253 +49307,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, fuzzy, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49517,31 +49565,31 @@ msgstr ""
 "     -----H----I\n"
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49553,13 +49601,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49574,13 +49622,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49592,19 +49640,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49619,19 +49667,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49640,7 +49688,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51739,7 +51787,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57851,7 +57899,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58158,7 +58206,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -58351,7 +58399,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58829,7 +58877,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62509,194 +62557,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64319,7 +64403,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64580,56 +64664,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64640,19 +64748,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64664,43 +64772,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.pot b/po/documentation.pot
index 1263dbe5fcff0c069b77a409b408bd283f2a3c0e..73db6c112886cdc713ad0082bebb5b87b5c250af 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-05-17 17:03+0200\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\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"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45
-#: en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45
+#: en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128
 #: en/git-status.txt:31
 #, no-wrap
 msgid "-b"
@@ -85,7 +85,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171
-#: en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167
+#: en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174
 #: en/git-grep.txt:155 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
@@ -98,7 +98,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176
 #: en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157
 #: en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26
 #: en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
@@ -139,7 +139,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122
 #: en/rev-list-options.txt:124
 #, no-wrap
 msgid "--first-parent"
@@ -156,11 +156,11 @@ msgstr ""
 
 #. type: Labeled list
 #: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22
-#: en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49
+#: en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49
 #: en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41
 #: en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63
 #: en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48
-#: en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, no-wrap
 msgid "-p"
 msgstr ""
@@ -2843,7 +2843,7 @@ msgid ""
 "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."
+"the tips of these tracking branches are merged. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2884,21 +2884,23 @@ msgid "merge.renameLimit"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 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."
+"The number of files to consider in the exhaustive portion of rename "
+"detection during a merge.  If not specified, defaults to the value of "
+"diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are "
+"specified, currently defaults to 7000.  This setting has no effect if rename "
+"detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, no-wrap
 msgid "merge.renames"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 msgid ""
 "Whether Git detects renames.  If set to \"false\", rename detection is "
 "disabled. If set to \"true\", basic rename detection is enabled.  Defaults "
@@ -2906,13 +2908,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:46
+#: en/config/merge.txt:48
 #, no-wrap
 msgid "merge.directoryRenames"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 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 "
@@ -2926,13 +2928,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:59
+#: en/config/merge.txt:61
 #, no-wrap
 msgid "merge.renormalize"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 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 "
@@ -2944,26 +2946,26 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:69
+#: en/config/merge.txt:71
 #, no-wrap
 msgid "merge.stat"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 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
+#: en/config/merge.txt:75
 #, no-wrap
 msgid "merge.autoStash"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 msgid ""
 "When set to true, automatically create a temporary stash entry before the "
 "operation begins, and apply it after the operation ends.  This means that "
@@ -2974,13 +2976,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, no-wrap
 msgid "merge.tool"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 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 "
@@ -2989,13 +2991,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:89
+#: en/config/merge.txt:91
 #, no-wrap
 msgid "merge.guitool"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 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.  "
@@ -3004,13 +3006,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:97
+#: en/config/merge.txt:99
 #, no-wrap
 msgid "merge.verbosity"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 msgid ""
 "Controls the amount of output shown by the recursive merge strategy.  Level "
 "0 outputs nothing except a final error message if conflicts were "
@@ -3021,39 +3023,39 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:105
+#: en/config/merge.txt:107
 #, no-wrap
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 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:109
+#: en/config/merge.txt:111
 #, no-wrap
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 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:113
+#: en/config/merge.txt:115
 #, no-wrap
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 msgid ""
 "Names a low-level merge driver to be used when performing an internal merge "
 "between common ancestors.  See linkgit:gitattributes[5] for details."
@@ -3990,17 +3992,17 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112
 #: en/git-am.txt:81 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:54
-#: en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, no-wrap
 msgid "-u"
 msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272
-#: en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, no-wrap
 msgid "--patch"
 msgstr ""
@@ -4096,35 +4098,35 @@ msgid "-m"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 msgid ""
 "This option makes diff output for merge commits to be shown in the default "
-"format. `-m` will produce the output only if `-p` is given as well. The "
-"default format could be changed using `log.diffMerges` configuration "
-"parameter, which default value is `separate`."
+"format. The default format could be changed using `log.diffMerges` "
+"configuration parameter, which default value is `separate`. `-m` implies "
+"`-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, no-wrap
 msgid "--diff-merges=first-parent"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, no-wrap
 msgid "--diff-merges=1"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 msgid ""
 "This option makes merge commits show the full diff with respect to the first "
 "parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, no-wrap
 msgid "--diff-merges=separate"
 msgstr ""
@@ -4133,7 +4135,8 @@ msgstr ""
 #: en/diff-options.txt:66
 msgid ""
 "This makes merge commits show the full diff with respect to each of the "
-"parents. Separate log entry and diff is generated for each parent."
+"parents. Separate log entry and diff is generated for each parent. This is "
+"the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4680,7 +4683,7 @@ msgstr ""
 #. type: Labeled list
 #: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34
 #: en/git-check-ignore.txt:47 en/git-checkout-index.txt:67
-#: en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175
+#: en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175
 #: 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:173
 #, no-wrap
@@ -4717,7 +4720,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157
 #: en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, no-wrap
 msgid "--name-only"
@@ -4971,7 +4974,7 @@ msgid "ignore-space-at-eol"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
 
@@ -4982,7 +4985,7 @@ msgid "ignore-space-change"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 msgid ""
 "Ignore changes in amount of whitespace.  This ignores whitespace at line "
 "end, and considers all other sequences of one or more whitespace characters "
@@ -5406,22 +5409,27 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 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."
+"The `-M` and `-C` options involve some preliminary steps that can detect "
+"subsets of renames/copies cheaply, followed by an exhaustive fallback "
+"portion that compares all remaining unpaired destinations to all relevant "
+"sources.  (For renames, only remaining unpaired sources are relevant; for "
+"copies, all original sources are relevant.)  For N sources and destinations, "
+"this exhaustive check is O(N^2).  This option prevents the exhaustive "
+"portion of rename/copy detection from running if the number of "
+"source/destination files involved exceeds the specified number.  Defaults to "
+"diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, no-wrap
 msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:609
+#: en/diff-options.txt:615
 msgid ""
 "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), "
 "Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, "
@@ -5434,14 +5442,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:612
+#: en/diff-options.txt:618
 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:618
+#: en/diff-options.txt:624
 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 "
@@ -5451,20 +5459,20 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:619
+#: en/diff-options.txt:625
 #, no-wrap
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 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:629
+#: en/diff-options.txt:635
 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: "
@@ -5474,32 +5482,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:631
+#: en/diff-options.txt:637
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 msgid ""
 "Look for differences whose patch text contains added/removed lines that "
 "match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 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:644
+#: en/diff-options.txt:650
 #, no-wrap
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5508,7 +5516,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 msgid ""
 "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log "
 "-S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of "
@@ -5516,25 +5524,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 msgid ""
 "Unless `--text` is supplied patches of binary files without a textconv "
 "filter will be ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:655
+#: en/diff-options.txt:661
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 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 "
@@ -5542,46 +5550,46 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:664
+#: en/diff-options.txt:670
 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:665
+#: en/diff-options.txt:671
 #, no-wrap
 msgid "--pickaxe-all"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 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:670
+#: en/diff-options.txt:676
 #, no-wrap
 msgid "--pickaxe-regex"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 msgid ""
 "Treat the <string> given to `-S` as an extended POSIX regular expression to "
 "match."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 msgid ""
 "Control the order in which files appear in the output.  This overrides the "
 "`diff.orderFile` configuration variable (see linkgit:git-config[1]).  To "
@@ -5589,7 +5597,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:693
+#: en/diff-options.txt:699
 msgid ""
 "The output order is determined by the order of glob patterns in "
 "<orderfile>.  All files with pathnames that match the first pattern are "
@@ -5602,17 +5610,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:695
+#: en/diff-options.txt:701
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 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 "
@@ -5620,12 +5628,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:705
+#: en/diff-options.txt:711
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 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 "
@@ -5635,19 +5643,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, no-wrap
 msgid "--skip-to=<file>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, no-wrap
 msgid "--rotate-to=<file>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 msgid ""
 "Discard the files before the named <file> from the output (i.e. 'skip to'), "
 "or move them to the end of the output (i.e. 'rotate to').  These were "
@@ -5656,32 +5664,32 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 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:727
+#: en/diff-options.txt:733
 #, no-wrap
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, no-wrap
 msgid "--no-relative"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 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 "
@@ -5692,108 +5700,108 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 en/fetch-options.txt:4 en/git-archimport.txt:99
+#: en/diff-options.txt:744 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:67
 #: en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70
 #: 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-stash.txt:154
+#: en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:156
 #: en/git-tag.txt:60
 #, no-wrap
 msgid "-a"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, no-wrap
 msgid "--text"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, no-wrap
 msgid "--ignore-cr-at-eol"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, no-wrap
 msgid "--ignore-space-at-eol"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, no-wrap
 msgid "--ignore-space-change"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71
 #: en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
 #, no-wrap
 msgid "-w"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:755
+#: en/diff-options.txt:761
 #, no-wrap
 msgid "--ignore-all-space"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 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:760
+#: en/diff-options.txt:766
 #, no-wrap
 msgid "--ignore-blank-lines"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, no-wrap
 msgid "--ignore-matching-lines=<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 msgid ""
 "Ignore changes whose all lines match <regex>.  This option may be specified "
 "more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 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 "
@@ -5801,20 +5809,20 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232
 #: en/git-restore.txt:58
 #, no-wrap
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, no-wrap
 msgid "--function-context"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 msgid ""
 "Show whole function as context lines for each change.  The function names "
 "are determined in the same way as `git diff` works out patch hunk headers "
@@ -5822,20 +5830,20 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, no-wrap
 msgid "--exit-code"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 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:788 en/fetch-options.txt:247 en/git-am.txt:78
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78
 #: en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31
 #: en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125
 #: en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49
@@ -5844,8 +5852,8 @@ msgstr ""
 #: en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78
 #: en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392
 #: en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118
-#: en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71
-#: en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671
+#: en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71
+#: en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671
 #: en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229
 #: en/merge-options.txt:138 en/rev-list-options.txt:224
 #, no-wrap
@@ -5853,18 +5861,18 @@ msgid "--quiet"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, no-wrap
 msgid "--ext-diff"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 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 "
@@ -5872,30 +5880,30 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:798
+#: en/diff-options.txt:804
 #, no-wrap
 msgid "--no-ext-diff"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, no-wrap
 msgid "--textconv"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, no-wrap
 msgid "--no-textconv"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 msgid ""
 "Allow (or disallow) external text conversion filters to be run when "
 "comparing binary files. See linkgit:gitattributes[5] for details. Because "
@@ -5907,13 +5915,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 msgid ""
 "Ignore changes to submodules in the diff generation. <when> can be either "
 "\"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using "
@@ -5929,57 +5937,57 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:825
+#: en/diff-options.txt:831
 #, no-wrap
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, no-wrap
 msgid "--no-prefix"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, no-wrap
 msgid "--ita-invisible-in-index"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 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 "
@@ -5990,7 +5998,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:846
+#: en/diff-options.txt:852
 msgid ""
 "For more detailed explanation on these common options, see also "
 "linkgit:gitdiffcore[7]."
@@ -6003,7 +6011,7 @@ msgstr ""
 #: 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:165 en/git-send-pack.txt:37
-#: en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276
+#: en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276
 #: en/rev-list-options.txt:142
 #, no-wrap
 msgid "--all"
@@ -6165,37 +6173,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 msgid ""
-"See also the `fetch.negotiationAlgorithm` configuration variable documented "
-"in linkgit:git-config[1]."
+"See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration "
+"variables documented in linkgit:git-config[1], and the `--negotiate-only` "
+"option below."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:69
+#, no-wrap
+msgid "--negotiate-only"
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+msgid ""
+"Do not fetch anything from the server, and instead print the ancestors of "
+"the provided `--negotiation-tip=*` arguments, which we have in common with "
+"the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+msgid ""
+"Internally this is used to implement the `push.negotiate` option, see "
+"linkgit:git-config[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50
 #: en/git-commit.txt:372 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:53
-#: en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688
+#: en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688
 #: en/git-worktree.txt:219
 #, no-wrap
 msgid "--dry-run"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, no-wrap
 msgid "--[no-]write-fetch-head"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 msgid ""
 "Write the list of remote refs fetched in the `FETCH_HEAD` file directly "
 "under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` "
@@ -6204,7 +6234,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 en/git-archimport.txt:81
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54
 #: en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31
@@ -6217,26 +6247,26 @@ msgid "-f"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117
 #: en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49
-#: en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290
+#: en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290
 #: en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, no-wrap
 msgid "--force"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 msgid ""
 "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update "
 "the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -6244,65 +6274,65 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67
 #: en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133
 #: en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34
-#: en/git-repack.txt:156 en/git-stash.txt:184
+#: en/git-repack.txt:158 en/git-stash.txt:186
 #, no-wrap
 msgid "-k"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54
 #: en/git-index-pack.txt:62 en/git-reset.txt:85
 #, no-wrap
 msgid "--keep"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, no-wrap
 msgid "--multiple"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 msgid ""
 "Allow several <repository> and <group> arguments to be specified. No "
 "<refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, no-wrap
 msgid "--[no-]auto-maintenance"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, no-wrap
 msgid "--[no-]auto-gc"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 msgid ""
 "Run `git maintenance run --auto` at the end to perform automatic repository "
 "maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by "
@@ -6310,39 +6340,39 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, no-wrap
 msgid "--[no-]write-commit-graph"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 msgid ""
 "Write a commit-graph after fetching. This overrides the config setting "
 "`fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, no-wrap
 msgid "--prefetch"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 msgid ""
 "Modify the configured refspec to place all refs into the `refs/prefetch/` "
 "namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, no-wrap
 msgid "--prune"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 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 "
@@ -6355,25 +6385,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134
 #: en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, no-wrap
 msgid "--prune-tags"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 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 "
@@ -6383,7 +6413,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:147 en/git-add.txt:69 en/git-blame.txt:71
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118
 #: en/git-grep.txt:147 en/git-mailinfo.txt:68 en/git-mv.txt:39
@@ -6398,13 +6428,13 @@ msgid "-n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, no-wrap
 msgid "--no-tags"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 msgid ""
 "By default, tags that point at objects that are downloaded from the remote "
 "repository are fetched and stored locally.  This option disables this "
@@ -6413,13 +6443,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:156
+#: en/fetch-options.txt:165
 #, no-wrap
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 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, "
@@ -6431,7 +6461,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 en/git-describe.txt:55 en/git-fsck.txt:41
+#: en/fetch-options.txt:177 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
@@ -6439,7 +6469,7 @@ msgid "--tags"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:175
+#: en/fetch-options.txt:184
 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 "
@@ -6449,13 +6479,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:186
 #, no-wrap
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 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 "
@@ -6469,24 +6499,24 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, no-wrap
 msgid "-j"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 msgid ""
 "If the `--multiple` option was specified, the different remotes will be "
 "fetched in parallel. If multiple submodules are fetched, they will be "
@@ -6495,34 +6525,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:201
+#: en/fetch-options.txt:210
 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:203 en/git-checkout.txt:298 en/git-push.txt:401
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401
 #: en/git-restore.txt:112 en/git-switch.txt:185
 #, no-wrap
 msgid "--no-recurse-submodules"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, no-wrap
 msgid "--set-upstream"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 msgid ""
 "If the remote is fetched successfully, add upstream (tracking) reference, "
 "used by argument-less linkgit:git-pull[1] and other commands. For more "
@@ -6531,13 +6561,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:225
 #, no-wrap
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 msgid ""
 "Prepend <path> to paths printed in informative messages such as \"Fetching "
 "submodule foo\".  This option is used internally when recursing over "
@@ -6545,13 +6575,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:221
+#: en/fetch-options.txt:230
 #, no-wrap
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 msgid ""
 "This option is used internally to temporarily provide a non-negative default "
 "value for the --recurse-submodules option.  All other methods of configuring "
@@ -6561,13 +6591,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:230
+#: en/fetch-options.txt:239
 #, no-wrap
 msgid "--update-head-ok"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 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 "
@@ -6576,13 +6606,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap
 msgid "--upload-pack <upload-pack>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 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 "
@@ -6590,7 +6620,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:246 en/git-am.txt:77 en/git-branch.txt:192
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192
 #: en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107
 #: en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368
 #: en/git-diff-files.txt:44 en/git-fetch-pack.txt:48
@@ -6600,7 +6630,7 @@ msgstr ""
 #: en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385
 #: en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78
 #: en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117
-#: en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223
+#: en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225
 #: en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143
 #: en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34
 #: en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
@@ -6609,14 +6639,14 @@ msgid "-q"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 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:252 en/git-add.txt:74 en/git-apply.txt:225
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225
 #: en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181
 #: en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353
 #: en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82
@@ -6634,7 +6664,7 @@ msgid "-v"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226
 #: en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130
 #: en/git-commit.txt:354 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
@@ -6650,13 +6680,13 @@ msgid "--verbose"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35
 #: en/merge-options.txt:144
 msgid "Be verbose."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111
 #: en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161
 #: en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70
 #: en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
@@ -6665,7 +6695,7 @@ msgid "--progress"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166
 #: en/git-push.txt:400
 msgid ""
 "Progress status is reported on the standard error stream by default when it "
@@ -6674,19 +6704,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap
 msgid "--server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 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 "
@@ -6696,13 +6726,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:272
+#: en/fetch-options.txt:281
 #, no-wrap
 msgid "--show-forced-updates"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 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 "
@@ -6710,13 +6740,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:278
+#: en/fetch-options.txt:287
 #, no-wrap
 msgid "--no-show-forced-updates"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 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 "
@@ -6726,36 +6756,36 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, no-wrap
 msgid "-4"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, no-wrap
 msgid "--ipv4"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, no-wrap
 msgid "-6"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, no-wrap
 msgid "--ipv6"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
 
@@ -7025,12 +7055,12 @@ msgstr ""
 #: en/git-checkout.txt:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46
-#: en/git-commit.txt:66 en/git-config.txt:75 en/git-count-objects.txt:20
+#: en/git-commit.txt:66 en/git-config.txt:76 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:40 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:116 en/git-fast-export.txt:25
+#: en/git-diff-tree.txt:26 en/git-diff.txt:120 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:106 en/git-fsck.txt:22
@@ -7053,7 +7083,7 @@ msgstr ""
 #: en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32
 #: 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-index.txt:40 en/git-show-ref.txt:34
-#: en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25
+#: en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25
 #: en/git-stripspace.txt:37 en/git-submodule.txt:264 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
@@ -7068,7 +7098,7 @@ msgstr ""
 #. type: Labeled list
 #: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400
 #: en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145
-#: en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, no-wrap
 msgid "<pathspec>..."
 msgstr ""
@@ -7110,7 +7140,7 @@ msgstr ""
 #: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149
 #: en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88
 #: en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51
-#: en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163
+#: en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165
 #: en/git-tag.txt:130 en/rev-list-options.txt:73
 #, no-wrap
 msgid "-i"
@@ -7149,7 +7179,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44
-#: en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261
+#: en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268
 #: en/git-grep.txt:265 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
@@ -7158,7 +7188,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260
-#: en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615
+#: en/git-config.txt:269 en/git-revert.txt:45 en/git-svn.txt:615
 #: en/git-tag.txt:178 en/merge-options.txt:15
 #, no-wrap
 msgid "--edit"
@@ -7370,7 +7400,7 @@ msgstr ""
 #. type: Labeled list
 #: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321
 #: en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80
-#: en/git-stash.txt:206
+#: en/git-stash.txt:208
 #, no-wrap
 msgid "--pathspec-from-file=<file>"
 msgstr ""
@@ -7378,7 +7408,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328
 #: en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87
-#: en/git-stash.txt:215
+#: en/git-stash.txt:217
 msgid ""
 "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is "
 "exactly `-` then standard input is used. Pathspec elements are separated by "
@@ -7390,7 +7420,7 @@ msgstr ""
 #. type: Labeled list
 #: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329
 #: en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88
-#: en/git-stash.txt:216
+#: en/git-stash.txt:218
 #, no-wrap
 msgid "--pathspec-file-nul"
 msgstr ""
@@ -7398,7 +7428,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333
 #: en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92
-#: en/git-stash.txt:222
+#: en/git-stash.txt:224
 msgid ""
 "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated "
 "with NUL character and all other characters are taken literally (including "
@@ -7410,7 +7440,7 @@ msgstr ""
 #: en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294
 #: en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51
 #: en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62
-#: en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap
 msgid "\\--"
 msgstr ""
@@ -7428,23 +7458,23 @@ msgstr ""
 #: en/git-checkout-index.txt:143 en/git-checkout.txt:518
 #: en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169
 #: en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50
-#: en/git-commit.txt:409 en/git-config.txt:373 en/git-credential-cache.txt:55
+#: en/git-commit.txt:409 en/git-config.txt:379 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:143
+#: en/git-daemon.txt:257 en/git-describe.txt:128 en/git-diff.txt:147
 #: en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247
 #: en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292
 #: en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67
 #: en/git-imap-send.txt:60 en/git-init.txt:154
-#: en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95
+#: en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95
 #: en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131
 #: en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218
 #: en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151
 #: en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456
-#: en/git-rm.txt:169 en/git-send-email.txt:483 en/git-shell.txt:66
+#: en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66
 #: en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61
-#: en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194
+#: en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194
 #: en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap
 msgid "EXAMPLES"
@@ -7855,7 +7885,7 @@ msgstr ""
 #: en/git-check-ignore.txt:119 en/git-checkout.txt:604
 #: en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137
 #: en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145
-#: en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568
+#: en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568
 #: en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73
 #: en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155
 #: en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89
@@ -7864,10 +7894,10 @@ msgstr ""
 #: en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81
 #: en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212
+#: en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:214
 #: en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140
-#: en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99
-#: en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450
+#: en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99
+#: en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450
 #: en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270
 #: en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568
 #: en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
@@ -7892,13 +7922,13 @@ msgstr ""
 #: en/git-checkout.txt:609 en/git-check-ref-format.txt:139
 #: en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24
 #: en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78
-#: en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529
+#: en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535
 #: en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29
 #: en/git-credential-cache.txt:79 en/git-credential-store.txt:109
 #: en/git-credential.txt:164 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:126
-#: en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223
+#: en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126
+#: en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227
 #: en/git-fast-export.txt:283 en/git-fast-import.txt:1572
 #: en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702
 #: en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417
@@ -7908,7 +7938,7 @@ msgstr ""
 #: en/git-http-backend.txt:276 en/git-http-fetch.txt:61 en/git-http-push.txt:96
 #: en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22
 #: en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451
-#: en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120
+#: en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120
 #: en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52
@@ -7921,14 +7951,14 @@ msgstr ""
 #: en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442
 #: en/git-rebase.txt:1301 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:266
-#: en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78
+#: en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78
 #: en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218
 #: en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481
-#: en/git-rm.txt:197 en/git-send-email.txt:529 en/git-send-pack.txt:155
+#: en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51
 #: en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94
-#: en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454
+#: en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454
 #: en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174
 #: en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391
 #: en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51
@@ -7952,13 +7982,13 @@ msgstr ""
 #: en/git-checkout.txt:610 en/git-check-ref-format.txt:140
 #: en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25
 #: en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79
-#: en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530
+#: en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536
 #: en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30
 #: en/git-credential-cache.txt:80 en/git-credential-store.txt:110
 #: en/git-credential.txt:165 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:127
-#: en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224
+#: en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127
+#: en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228
 #: en/git-fast-export.txt:284 en/git-fast-import.txt:1573
 #: en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703
 #: en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418
@@ -7968,7 +7998,7 @@ msgstr ""
 #: en/git-http-backend.txt:277 en/git-http-fetch.txt:62 en/git-http-push.txt:97
 #: en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23
 #: en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452
-#: en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121
+#: en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121
 #: en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53
@@ -7981,14 +8011,14 @@ msgstr ""
 #: en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443
 #: en/git-rebase.txt:1302 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:267
-#: en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79
+#: en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79
 #: en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219
 #: en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482
-#: en/git-rm.txt:198 en/git-send-email.txt:530 en/git-send-pack.txt:156
+#: en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52
 #: en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95
-#: en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455
+#: en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455
 #: en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175
 #: en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392
 #: en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52
@@ -8487,9 +8517,9 @@ msgstr ""
 
 #. type: Title -
 #: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416
-#: en/git-fsck.txt:113 en/git-log.txt:181 en/git-merge-base.txt:76
+#: en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:253
+#: en/git-reset.txt:378 en/git-show.txt:84 en/git-stash.txt:255
 #: en/git-tag.txt:231
 #, no-wrap
 msgid "DISCUSSION"
@@ -8734,7 +8764,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, no-wrap
 msgid "--index"
 msgstr ""
@@ -9112,13 +9142,13 @@ msgstr ""
 
 #. type: Title -
 #: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302
-#: en/git-check-mailmap.txt:40 en/git-config.txt:277
+#: en/git-check-mailmap.txt:40 en/git-config.txt:284
 #: en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53
 #: en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107
 #: en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70
-#: en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358
+#: en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358
 #: en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124
-#: en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444
+#: en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455
 #: en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215
 #: en/git-update-index.txt:524
 #, no-wrap
@@ -9441,7 +9471,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175
 #: en/git-show-branch.txt:80 en/git-tag.txt:100
 #, no-wrap
 msgid "--list"
@@ -9586,7 +9616,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, no-wrap
 msgid "-0"
 msgstr ""
@@ -14109,7 +14139,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231
 #: en/git-switch.txt:146
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -14590,7 +14620,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132
-#: en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
 
@@ -16216,7 +16246,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24
 #: en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, no-wrap
 msgid "--local"
@@ -17133,7 +17163,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291
 #: en/git-credential-store.txt:45 en/git-show-ref.txt:174
 #: en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap
@@ -17259,7 +17289,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 msgid ""
-"Use the interactive patch selection interface to chose which changes to "
+"Use the interactive patch selection interface to choose which changes to "
 "commit. See linkgit:git-add[1] for details."
 msgstr ""
 
@@ -17423,7 +17453,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52
 #: en/git-status.txt:47
 #, no-wrap
 msgid "--long"
@@ -17437,7 +17467,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, no-wrap
 msgid "--null"
 msgstr ""
@@ -18296,39 +18326,39 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, no-wrap
 msgid "--replace-all"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 msgid ""
 "Default behavior is to replace at most one line. This replaces all lines "
 "matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, no-wrap
 msgid "--add"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 msgid ""
 "Adds a new line to the option without altering any existing values.  This is "
 "the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, no-wrap
 msgid "--get"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 msgid ""
 "Get the value for a given key (optionally filtered by a regex matching the "
 "value). Returns error code 1 if the key was not found and the last value if "
@@ -18336,24 +18366,24 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, no-wrap
 msgid "--get-all"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, no-wrap
 msgid "--get-regexp"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 msgid ""
 "Like --get-all, but interprets the name as a regular expression and writes "
 "out the key names.  Regular expression matching is currently case-sensitive "
@@ -18362,13 +18392,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 msgid ""
 "When given a two-part name section.key, the value for section.<url>.key "
 "whose <url> part matches the best to the given URL is returned (if no such "
@@ -18378,13 +18408,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, no-wrap
 msgid "--global"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 msgid ""
 "For writing options: write to global `~/.gitconfig` file rather than the "
 "repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if "
@@ -18392,60 +18422,60 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 msgid ""
 "For reading options: read only from global `~/.gitconfig` and from "
 "`$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138
-#: en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139
+#: en/git-config.txt:154 en/git-config.txt:353
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, no-wrap
 msgid "--system"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 msgid ""
 "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather "
 "than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 msgid ""
 "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` "
 "rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 msgid ""
 "For writing options: write to the repository `.git/config` file.  This is "
 "the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 msgid ""
 "For reading options: read only from the repository `.git/config` rather than "
 "from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, no-wrap
 msgid "--worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 msgid ""
 "Similar to `--local` except that `.git/config.worktree` is read from or "
 "written to if `extensions.worktreeConfig` is present. If not it's the same "
@@ -18453,30 +18483,39 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+#: en/git-config.txt:149
+msgid ""
+"For writing options: write to the specified file rather than the repository "
+"`.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
+msgid ""
+"For reading options: read only from the specified file rather than from all "
+"available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 msgid ""
 "Similar to `--file` but use the given blob instead of a file. E.g.  you can "
 "use 'master:.gitmodules' to read values from the file '.gitmodules' in the "
@@ -18486,62 +18525,62 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, no-wrap
 msgid "--remove-section"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, no-wrap
 msgid "--rename-section"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, no-wrap
 msgid "--unset"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, no-wrap
 msgid "--unset-all"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, no-wrap
 msgid "--fixed-value"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 msgid ""
 "When used with the `value-pattern` argument, treat `value-pattern` as an "
 "exact string instead of a regular expression. This will restrict the "
@@ -18550,13 +18589,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 msgid ""
 "'git config' will ensure that any input or output is valid under the given "
 "type constraint(s), and will canonicalize outgoing values in `<type>`'s "
@@ -18564,17 +18603,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 msgid ""
 "'int': canonicalize values as simple decimal numbers. An optional suffix of "
 "'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or "
@@ -18582,14 +18621,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 msgid ""
 "'bool-or-int': canonicalize according to either 'bool' or 'int', as "
 "described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 msgid ""
 "'path': canonicalize by adding a leading `~` to the value of `$HOME` and "
 "`~user` to the home directory for the specified user. This specifier has no "
@@ -18598,7 +18637,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 msgid ""
 "'expiry-date': canonicalize by converting from a fixed or relative "
 "date-string to a timestamp. This specifier has no effect when setting the "
@@ -18606,7 +18645,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 msgid ""
 "'color': When getting a value, canonicalize by converting to an ANSI color "
 "escape sequence. When setting a value, a sanity-check is performed to ensure "
@@ -18615,50 +18654,50 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, no-wrap
 msgid "--bool"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, no-wrap
 msgid "--int"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, no-wrap
 msgid "--bool-or-int"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, no-wrap
 msgid "--path"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, no-wrap
 msgid "--expiry-date"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 msgid ""
 "Historical options for selecting a type specifier. Prefer instead `--type` "
 "(see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, no-wrap
 msgid "--no-type"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 msgid ""
 "Un-sets the previously set type specifier (if one was previously set). This "
 "option requests that 'git config' not canonicalize the retrieved variable.  "
@@ -18666,7 +18705,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 msgid ""
 "For all options that output values and/or keys, always end values with the "
 "null character (instead of a newline). Use newline instead as a delimiter "
@@ -18675,18 +18714,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, no-wrap
 msgid "--show-origin"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 msgid ""
 "Augment the output of all queried config options with the origin type (file, "
 "standard input, blob, command line) and the actual origin (config file path, "
@@ -18694,13 +18733,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, no-wrap
 msgid "--show-scope"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 msgid ""
 "Similar to `--show-origin` in that it augments the output of all queried "
 "config options with the scope of that value (local, global, system, "
@@ -18708,13 +18747,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 msgid ""
 "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or "
 "\"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is "
@@ -18726,13 +18765,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 msgid ""
 "Find the color configured for `name` (e.g. `color.diff.new`) and output it "
 "as the ANSI color escape sequence to the standard output.  The optional "
@@ -18741,7 +18780,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 msgid ""
 "`--type=color [--default=<default>]` is preferred over `--get-color` (but "
 "note that `--get-color` will omit the trailing newline printed by "
@@ -18749,20 +18788,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:265
+#: en/git-config.txt:272
 msgid ""
 "Opens an editor to modify the specified config file; either `--system`, "
 "`--global`, or repository (default)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:266
+#: en/git-config.txt:273
 #, no-wrap
 msgid "--[no-]includes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 msgid ""
 "Respect `include.*` directives in config files when looking up "
 "values. Defaults to `off` when a specific file is given (e.g., using "
@@ -18770,20 +18809,20 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:272
+#: en/git-config.txt:279
 #, no-wrap
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 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:281
+#: en/git-config.txt:288
 msgid ""
 "`pager.config` is only respected when listing configuration, i.e., when "
 "using `--list` or any of the `--get-*` which may return multiple results.  "
@@ -18791,31 +18830,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:288
+#: en/git-config.txt:295
 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:289
+#: en/git-config.txt:296
 #, no-wrap
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 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 "
@@ -18825,42 +18864,42 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:300
+#: en/git-config.txt:307
 #, no-wrap
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 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:316
+#: en/git-config.txt:323
 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 "
@@ -18870,7 +18909,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:320
+#: en/git-config.txt:327
 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 "
@@ -18878,14 +18917,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:323
+#: en/git-config.txt:330
 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:327
+#: en/git-config.txt:334
 msgid ""
 "All writing options will per default write to the repository specific "
 "configuration file. Note that this also affects options like `--replace-all` "
@@ -18893,36 +18932,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:333
+#: en/git-config.txt:338
 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."
+"You can override these rules using the `--global`, `--system`, `--local`, "
+"`--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332
+#: en/git-config.txt:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332
 #: en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, no-wrap
-msgid "GIT_CONFIG"
-msgstr ""
-
-#. type: Plain text
-#: en/git-config.txt:342
-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:343
 #, no-wrap
@@ -18994,13 +19016,28 @@ msgid ""
 "example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, no-wrap
+msgid "GIT_CONFIG"
+msgstr ""
+
 #. type: Plain text
 #: en/git-config.txt:376
+msgid ""
+"If no `--file` option is provided to `git config`, use the file given by "
+"`GIT_CONFIG` as if it were provided via `--file`. This variable has no "
+"effect on other Git commands, and is mostly for historical compatibility; "
+"there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap
 msgid ""
 "#\n"
@@ -19011,7 +19048,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap
 msgid ""
 "; core variables\n"
@@ -19021,7 +19058,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap
 msgid ""
 "; Our diff algorithm\n"
@@ -19031,7 +19068,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap
 msgid ""
 "; Proxy settings\n"
@@ -19041,7 +19078,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap
 msgid ""
 "; HTTP\n"
@@ -19053,18 +19090,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 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 "
@@ -19072,133 +19109,133 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:425
 #, no-wrap
 msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:422
+#: en/git-config.txt:428
 msgid "This makes sure that only the key/value pair for kernel.org is replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:424
+#: en/git-config.txt:430
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 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:433
+#: en/git-config.txt:439
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 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:461
+#: en/git-config.txt:467
 #, no-wrap
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 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:468
+#: en/git-config.txt:474
 #, no-wrap
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap
 msgid ""
 "#!/bin/sh\n"
@@ -19208,14 +19245,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 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:503
+#: en/git-config.txt:509
 #, no-wrap
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify "
@@ -19230,7 +19267,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289
 #: en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241
 #: en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184
 #: en/git-svn.txt:1151 en/git-worktree.txt:485
@@ -19239,7 +19276,7 @@ msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 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 "
@@ -19248,7 +19285,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:517
+#: en/git-config.txt:523
 #, no-wrap
 msgid ""
 "  [section.subsection]\n"
@@ -19256,12 +19293,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap
 msgid ""
 "  [section.subsection]\n"
@@ -22290,21 +22327,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 msgid ""
-"Instead of using the default 7 hexadecimal digits as the abbreviated object "
-"name, use <n> digits, or as many digits as needed to form a unique object "
-"name.  An <n> of 0 will suppress long format, only showing the closest tag."
+"Instead of using the default number of hexadecimal digits (which will vary "
+"according to the number of objects in the repository with a default of 7) of "
+"the abbreviated object name, use <n> digits, or as many digits as needed to "
+"form a unique object name. An <n> of 0 will suppress long format, only "
+"showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 msgid ""
 "Instead of considering only the 10 most recent tags as candidates to "
 "describe the input commit-ish consider up to <n> candidates.  Increasing <n> "
@@ -22313,33 +22352,33 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, no-wrap
 msgid "--exact-match"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 msgid ""
 "Only output exact matches (a tag directly references the supplied commit).  "
 "This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, no-wrap
 msgid "--debug"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 msgid ""
 "Verbosely display information about the searching strategy being employed to "
 "standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 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 "
@@ -22350,13 +22389,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 msgid ""
 "Only consider tags matching the given `glob(7)` pattern, excluding the "
 "\"refs/tags/\" prefix. If used with `--all`, it also considers local "
@@ -22368,13 +22407,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 msgid ""
 "Do not consider tags matching the given `glob(7)` pattern, excluding the "
 "\"refs/tags/\" prefix. If used with `--all`, it also does not consider local "
@@ -22388,18 +22427,18 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, no-wrap
 msgid "--always"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 msgid ""
 "Follow only the first parent commit upon seeing a merge commit.  This is "
 "useful when you wish to not match tags on branches merged in the history of "
@@ -22407,12 +22446,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -22420,7 +22459,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 msgid ""
 "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since "
 "it has a few commits on top of that, describe has added the number of "
@@ -22429,24 +22468,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 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."
+"displayed by \"git log v1.0.4..parent\".  The hash suffix is \"-g\" + an "
+"unambigous abbreviation for the tip commit of parent (which was "
+"`2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation "
+"scales as the repository grows, using the approximate number of objects in "
+"the repository and a bit of math around the birthday paradox, and defaults "
+"to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -22454,14 +22496,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 msgid ""
 "With --all, the command can use branch heads as references, so the output "
 "shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -22469,7 +22511,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -22477,14 +22519,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 msgid ""
 "With --abbrev set to 0, the command can be used to find the closest tagname "
 "without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -22492,7 +22534,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 msgid ""
 "Note that the suffix you get if you type these commands today may be longer "
 "than what Linus saw above when he ran these commands, as your Git repository "
@@ -22502,13 +22544,13 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 msgid ""
 "For each commit-ish supplied, 'git describe' will first look for a tag which "
 "tags exactly that commit.  Annotated tags will always be preferred over "
@@ -22518,7 +22560,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 msgid ""
 "If an exact match was not found, 'git describe' will walk back through the "
 "commit history to locate an ancestor commit which has been tagged.  The "
@@ -22528,7 +22570,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 msgid ""
 "If multiple tags were found during the walk then the tag which has the "
 "fewest commits different from the input commit-ish will be selected and "
@@ -22538,7 +22580,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 msgid ""
 "Tree objects as well as tag objects not pointing at commits, cannot be "
 "described.  When describing blobs, the lightweight tags pointing at blobs "
@@ -22575,19 +22617,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap
 msgid "-3 --theirs"
 msgstr ""
@@ -23240,7 +23282,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, no-wrap
 msgid "<path>..."
 msgstr ""
@@ -23470,14 +23512,14 @@ msgstr ""
 #: en/git-diff.txt:56
 msgid ""
 "If --merge-base is given, instead of using <commit>, use the merge base of "
-"<commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff "
-"$(git merge-base A HEAD)`."
+"<commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git "
+"diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, no-wrap
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -23488,19 +23530,27 @@ msgid ""
 "or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+msgid ""
+"If --merge-base is given, instead of using <commit>, use the merge base of "
+"<commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff "
+"$(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, no-wrap
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 msgid ""
 "If --merge-base is given, use the merge base of the two commits for the "
 "\"before\" side.  `git diff --merge-base A B` is equivalent to `git diff "
@@ -23508,13 +23558,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, no-wrap
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 msgid ""
 "This form is to view the results of a merge commit.  The first listed "
 "<commit> must be the merge itself; the remaining two or more commits should "
@@ -23525,13 +23575,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, no-wrap
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 msgid ""
 "This is synonymous to the earlier form (without the `..`) for viewing the "
 "changes between two arbitrary <commit>.  If <commit> on one side is omitted, "
@@ -23539,13 +23589,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, no-wrap
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 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 "
@@ -23554,7 +23604,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 msgid ""
 "Just in case you are doing something exotic, it should be noted that all of "
 "the <commit> in the above description, except in the `--merge-base` case and "
@@ -23562,7 +23612,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 msgid ""
 "For a more complete list of ways to spell <commit>, see \"SPECIFYING "
 "REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about "
@@ -23572,20 +23622,20 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 msgid ""
 "This form is to view the differences between the raw contents of two blob "
 "objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 msgid ""
 "Compare the working tree with the \"base\" version (stage #1), \"our "
 "branch\" (stage #2) or \"their branch\" (stage #3).  The index contains "
@@ -23594,27 +23644,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 msgid ""
 "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be "
 "used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 msgid ""
 "The <paths> parameters, when given, are used to limit the diff to the named "
 "paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap
 msgid ""
 "$ git diff            <1>\n"
@@ -23623,32 +23673,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 msgid ""
 "Changes between the index and your last commit; what you would be committing "
 "if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 msgid ""
 "Changes in the working tree since your last commit; what you would be "
 "committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap
 msgid ""
 "$ git diff test            <1>\n"
@@ -23657,32 +23707,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 msgid ""
 "Instead of using the tip of the current branch, compare with the tip of "
 "\"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 msgid ""
 "Instead of comparing with the tip of \"test\" branch, compare with the tip "
 "of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, no-wrap
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -23691,31 +23741,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52
 #: en/git-web--browse.txt:52
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 msgid ""
 "Changes that occurred on the master branch since when the topic branch was "
 "started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -23724,28 +23774,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -23753,19 +23803,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 msgid ""
 "Spend extra cycles to find renames, copies and complete rewrites (very "
 "expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 msgid ""
 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], "
 "linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], "
@@ -32460,7 +32510,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, no-wrap
 msgid "--count"
 msgstr ""
@@ -36301,30 +36351,32 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 msgid ""
 "Print out the ref names of any commits that are shown. If 'short' is "
 "specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and "
 "'refs/remotes/' will not be printed. If 'full' is specified, the full ref "
 "name (including prefix) will be printed. If 'auto' is specified, then if the "
 "output is going to a terminal, the ref names are shown as if 'short' were "
-"given, otherwise no ref names are shown. The default option is 'short'."
+"given, otherwise no ref names are shown. The option `--decorate` is "
+"short-hand for `--decorate=short`.  Default to configuration value of "
+"`log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 msgid ""
 "If no `--decorate-refs` is given, pretend as if all refs were included.  For "
 "each candidate, do not use it for decoration if it matches any patterns "
@@ -36335,45 +36387,45 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, no-wrap
 msgid "--source"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 msgid ""
 "Print out the ref name given on the command line by which each commit was "
 "reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, no-wrap
 msgid "--[no-]mailmap"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, no-wrap
 msgid "--[no-]use-mailmap"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 msgid ""
 "Use mailmap file to map author and committer names and email addresses to "
 "canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, no-wrap
 msgid "--full-diff"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 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 "
@@ -36383,20 +36435,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 msgid ""
 "Note that this affects all diff-based output types, e.g. those produced by "
 "`--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, no-wrap
 msgid "--log-size"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 msgid ""
 "Include a line ``log size <number>'' in the output for each commit, where "
 "<number> is the length of that commit's message in bytes.  Intended to speed "
@@ -36405,13 +36457,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 msgid ""
 "Show only commits in the specified revision range.  When no <revision range> "
 "is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
@@ -36422,13 +36474,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, no-wrap
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 msgid ""
 "Show only commits that are enough to explain how the files that match the "
 "specified paths came to be.  See 'History Simplification' below for details "
@@ -36436,27 +36488,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 msgid ""
 "Paths may need to be prefixed with `--` to separate them from options or the "
 "revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 msgid ""
 "By default, `git log` does not generate any diff output. The options below "
 "can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 msgid ""
 "Note that unless one of `--diff-merges` variants (including short `-m`, "
 "`-c`, and `--cc` options) is explicitly given, merge commits will not show a "
@@ -36466,102 +36518,102 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 msgid ""
 "Show all commits since version 'v2.6.12' that changed any file in the "
 "`include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 msgid ""
 "Show the changes during the last two weeks to the file 'gitk'.  The `--` is "
 "necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 msgid ""
 "Show the commits that are in the \"test\" branch but not yet in the "
 "\"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 msgid ""
 "Shows the commits that changed `builtin/rev-list.c`, including those commits "
 "that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 msgid ""
 "Shows all commits that are in any of local branches but not in any of "
 "remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 msgid ""
 "Shows all commits that are in local master but not in any remote repository "
 "master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 msgid ""
 "Shows the history including change diffs, but only from the ``main branch'' "
 "perspective, skipping commits that come from merged branches, and showing "
@@ -36571,68 +36623,68 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 msgid ""
 "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for "
 "settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, no-wrap
 msgid "format.pretty"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 msgid ""
 "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults "
 "to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, no-wrap
 msgid "i18n.logOutputEncoding"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 msgid ""
 "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults "
 "to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, no-wrap
 msgid "log.date"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 msgid ""
 "Default format for human-readable dates.  (Compare the `--date` option.)  "
 "Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 "
@@ -36640,20 +36692,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 msgid ""
 "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" "
 "will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, no-wrap
 msgid "log.follow"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 msgid ""
 "If `true`, `git log` will act as if the `--follow` option was used when a "
 "single <path> is given.  This has the same limitations as `--follow`, "
@@ -36662,13 +36714,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, no-wrap
 msgid "log.showRoot"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 msgid ""
 "If `false`, `git log` and related commands will not treat the initial commit "
 "as a big creation event.  Any root commits in `git log -p` output would be "
@@ -36676,37 +36728,37 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, no-wrap
 msgid "log.showSignature"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 msgid ""
 "If `true`, `git log` and related commands will act as if the "
 "`--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 msgid ""
 "Which refs, in addition to the default set by `core.notesRef` or "
 "`GIT_NOTES_REF`, to read notes from when showing commit messages with the "
@@ -36714,7 +36766,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 msgid ""
 "May be an unabbreviated ref name or a glob and may be specified multiple "
 "times.  A warning will be issued for refs that do not exist, but a glob that "
@@ -36722,7 +36774,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 msgid ""
 "This setting can be disabled by the `--no-notes` option, overridden by the "
 "`GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the "
@@ -42564,9 +42616,10 @@ msgid ""
 "certain size on your filesystem, and this option can be used to tell the "
 "command to split the output packfile into multiple independent packfiles, "
 "each not larger than the given size. The size can be suffixed with \"k\", "
-"\"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option "
-"prevents the creation of a bitmap index.  The default is unlimited, unless "
-"the config variable `pack.packSizeLimit` is set."
+"\"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default "
+"is unlimited, unless the config variable `pack.packSizeLimit` is set. Note "
+"that this option may result in a larger and slower repository; see the "
+"discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -42583,7 +42636,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -42842,7 +42895,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, no-wrap
 msgid "--keep-unreachable"
 msgstr ""
@@ -42880,7 +42933,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, no-wrap
 msgid "--delta-islands"
 msgstr ""
@@ -43039,7 +43092,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 msgid ""
 "Various configuration variables affect packing, see linkgit:git-config[1] "
 "(search for \"pack\" and \"delta\")."
@@ -43680,7 +43733,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-pull.txt:121
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -44297,8 +44350,8 @@ msgid ""
 "have to bypass the \"must fast-forward\" rule in order to replace the "
 "history you originally published with the rebased history.  If somebody else "
 "built on top of your original history while you are rebasing, the tip of the "
-"branch at the remote may advance with her commit, and blindly pushing with "
-"`--force` will lose her work."
+"branch at the remote may advance with their commit, and blindly pushing with "
+"`--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -50393,23 +50446,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 msgid ""
 "Maximum size of each output pack file. The size can be suffixed with \"k\", "
 "\"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If "
 "specified, multiple packfiles may be created, which also prevents the "
 "creation of a bitmap index.  The default is unlimited, unless the config "
-"variable `pack.packSizeLimit` is set."
+"variable `pack.packSizeLimit` is set. Note that this option may result in a "
+"larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, no-wrap
 msgid "--write-bitmap-index"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 msgid ""
 "Write a reachability bitmap index as part of the repack. This only makes "
 "sense when used with `-a` or `-A`, as the bitmaps must be able to refer to "
@@ -50419,13 +50473,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, no-wrap
 msgid "--pack-kept-objects"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 msgid ""
 "Include objects in `.keep` files when repacking.  Note that we still do not "
 "delete `.keep` packs after `pack-objects` finishes.  This means that we may "
@@ -50436,7 +50490,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 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 "
@@ -50445,13 +50499,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 msgid ""
 "When loosening unreachable objects, do not bother loosening any objects "
 "older than `<when>`. This can be used to optimize out the write of any "
@@ -50459,7 +50513,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 msgid ""
 "When used with `-ad`, any unreachable objects from existing packs will be "
 "appended to the end of the packfile instead of being removed. In addition, "
@@ -50468,33 +50522,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 msgid ""
 "Pass the `--delta-islands` option to `git-pack-objects`, see "
 "linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 msgid ""
 "Arrange resulting pack structure so that each successive pack contains at "
 "least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 msgid ""
 "`git repack` ensures this by determining a \"cut\" of packfiles that need to "
 "be repacked into one in order to ensure a geometric progression. It picks "
@@ -50503,7 +50557,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 msgid ""
 "Unlike other repack modes, the set of objects to pack is determined uniquely "
 "by the set of packs being \"rolled-up\"; in other words, the packs "
@@ -50512,7 +50566,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 msgid ""
 "When `--unpacked` is specified, loose objects are implicitly included in "
 "this \"roll-up\", without respect to their reachability. This is subject to "
@@ -50522,7 +50576,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 msgid ""
 "By default, the command passes `--delta-base-offset` option to 'git "
 "pack-objects'; this typically results in slightly smaller packs, but the "
@@ -50536,7 +50590,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 msgid ""
 "Delta compression is not used on objects larger than the "
 "`core.bigFileThreshold` configuration variable and on files with the "
@@ -50544,7 +50598,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr ""
 
@@ -51791,7 +51845,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap
 msgid "Interrupted workflow"
 msgstr ""
@@ -54498,24 +54552,41 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+msgid ""
+"Specify a command to run to send the email. The command should be "
+"sendmail-like; specifically, it must support the `-i` option.  The command "
+"will be executed in the shell if necessary.  Default is the value of "
+"`sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also "
+"unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, "
+"`/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 msgid ""
 "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value "
 "reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 msgid ""
 "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO "
 "command to the SMTP server.  Some servers require the FQDN to match your IP "
@@ -54524,26 +54595,26 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 msgid ""
 "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting "
 "forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, no-wrap
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 msgid ""
 "If at least one of the specified mechanisms matches the ones advertised by "
 "the SMTP server and if it is supported by the utilized SASL library, the "
@@ -54554,13 +54625,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 msgid ""
 "Password for SMTP-AUTH. The argument is optional: If no argument is "
 "specified, then the empty string is used as the password. Default is the "
@@ -54569,7 +54640,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 msgid ""
 "Furthermore, passwords need not be specified in configuration files or on "
 "the command line. If a username has been specified (with `--smtp-user` or a "
@@ -54579,42 +54650,49 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, no-wrap
 msgid "--no-smtp-auth"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
 msgid ""
 "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` "
-"or a raw IP address).  Alternatively it can specify a full pathname of a "
-"sendmail-like program instead; the program must support the `-i` option.  "
-"Default value can be specified by the `sendemail.smtpServer` configuration "
-"option; the built-in default is to search for `sendmail` in `/usr/sbin`, "
-"`/usr/lib` and $PATH if such program is available, falling back to "
+"or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also "
+"unspecified, the default is to search for `sendmail` in `/usr/sbin`, "
+"`/usr/lib` and $PATH if such a program is available, falling back to "
 "`localhost` otherwise."
 msgstr ""
 
+#. type: Plain text
+#: en/git-send-email.txt:232
+msgid ""
+"For backward compatibility, this option can also specify a full pathname of "
+"a sendmail-like program instead; the program must support the `-i` option.  "
+"This method does not support passing arguments or using plain command "
+"names.  For those use cases, consider using `--sendmail-cmd` instead."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 msgid ""
 "Specifies a port different from the default port (SMTP servers typically "
 "listen to smtp port 25, but may also listen to submission port 587, or the "
@@ -54624,20 +54702,20 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 msgid ""
 "If set, specifies the outgoing SMTP server option to use.  Default value can "
 "be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 msgid ""
 "The --smtp-server-option option must be repeated for each option you want to "
 "pass to the server. Likewise, different lines in the configuration files "
@@ -54645,24 +54723,24 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, no-wrap
 msgid "--smtp-ssl"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, no-wrap
 msgid "--smtp-ssl-cert-path"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 msgid ""
 "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate "
 "validation (either a directory that has been processed by 'c_rehash', or a "
@@ -54675,13 +54753,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 msgid ""
 "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a "
 "username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then "
@@ -54689,13 +54767,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 msgid ""
 "Enable (1) or disable (0) debug output. If enabled, SMTP commands and "
 "replies will be printed. Useful to debug TLS connection and authentication "
@@ -54703,13 +54781,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 msgid ""
 "Some email servers (e.g. smtp.163.com) limit the number emails to be sent "
 "per session (connection) and this will lead to a failure when sending many "
@@ -54721,13 +54799,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 msgid ""
 "Waiting $<int> seconds before reconnecting to SMTP server. Used together "
 "with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` "
@@ -54735,45 +54813,45 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 msgid ""
 "Clears any list of \"To:\", \"Cc:\", \"Bcc:\" addresses previously set via "
 "config."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:285
+#: en/git-send-email.txt:296
 #, no-wrap
 msgid "--no-identity"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 msgid ""
 "Clears the previously read value of `sendemail.identity` set via config, if "
 "any."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:289
+#: en/git-send-email.txt:300
 #, no-wrap
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 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 "
@@ -54782,13 +54860,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:295
+#: en/git-send-email.txt:306
 #, no-wrap
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 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 "
@@ -54797,13 +54875,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:301
+#: en/git-send-email.txt:312
 #, no-wrap
 msgid "--[no-]chain-reply-to"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 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 "
@@ -54814,13 +54892,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:309
+#: en/git-send-email.txt:320
 #, no-wrap
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 msgid ""
 "A configuration identity. When given, causes values in the "
 "'sendemail.<identity>' subsection to take precedence over values in the "
@@ -54829,13 +54907,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:315
+#: en/git-send-email.txt:326
 #, no-wrap
 msgid "--[no-]signed-off-by-cc"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:319
+#: en/git-send-email.txt:330
 msgid ""
 "If this is set, add emails found in the `Signed-off-by` trailer or Cc: lines "
 "to the cc list. Default is the value of `sendemail.signedoffbycc` "
@@ -54843,13 +54921,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:320
+#: en/git-send-email.txt:331
 #, no-wrap
 msgid "--[no-]cc-cover"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 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 "
@@ -54858,13 +54936,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:326
+#: en/git-send-email.txt:337
 #, no-wrap
 msgid "--[no-]to-cover"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 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 "
@@ -54873,49 +54951,49 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:332
+#: en/git-send-email.txt:343
 #, no-wrap
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 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:343
+#: en/git-send-email.txt:354
 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:345
+#: en/git-send-email.txt:356
 msgid ""
 "'sob' will avoid including anyone mentioned in the Signed-off-by trailers "
 "except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 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 "
@@ -54923,22 +55001,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:349
+#: en/git-send-email.txt:360
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 msgid ""
 "Default is the value of `sendemail.suppresscc` configuration value; if that "
 "is unspecified, default to 'self' if --suppress-from is specified, as well "
@@ -54946,13 +55024,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:357
+#: en/git-send-email.txt:368
 #, no-wrap
 msgid "--[no-]suppress-from"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 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 "
@@ -54960,13 +55038,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:362
+#: en/git-send-email.txt:373
 #, no-wrap
 msgid "--[no-]thread"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 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` "
@@ -54975,7 +55053,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:373
+#: en/git-send-email.txt:384
 msgid ""
 "If disabled with \"--no-thread\", those headers will not be added (unless "
 "specified with --in-reply-to).  Default is the value of the "
@@ -54984,7 +55062,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:379
+#: en/git-send-email.txt:390
 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 "
@@ -54993,53 +55071,53 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:382
+#: en/git-send-email.txt:393
 #, no-wrap
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 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:393
+#: en/git-send-email.txt:404
 msgid ""
 "'compose' will confirm before sending the first message when using "
 "--compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 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 "
@@ -55047,18 +55125,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:402
+#: en/git-send-email.txt:413
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, no-wrap
 msgid "--[no-]format-patch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 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 "
@@ -55067,37 +55145,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:412
+#: en/git-send-email.txt:423
 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:413
+#: en/git-send-email.txt:424
 #, no-wrap
 msgid "--[no-]validate"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 msgid ""
 "Perform sanity checks on patches.  Currently, validation means the "
 "following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -55107,31 +55185,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 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:431
+#: en/git-send-email.txt:442
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, no-wrap
 msgid "--dump-aliases"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 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 "
@@ -55140,33 +55218,33 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:446
+#: en/git-send-email.txt:457
 #, no-wrap
 msgid "sendemail.aliasesFile"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 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:450
+#: en/git-send-email.txt:461
 #, no-wrap
 msgid "sendemail.aliasFileType"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 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:458
+#: en/git-send-email.txt:469
 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 "
@@ -55174,56 +55252,56 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:460
+#: en/git-send-email.txt:471
 #, no-wrap
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 msgid ""
 "explicitly unsupported constructs, and any other lines that are not "
 "recognized by the parser."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:471
+#: en/git-send-email.txt:482
 #, no-wrap
 msgid "sendemail.multiEdit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 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 "
@@ -55232,13 +55310,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:477
+#: en/git-send-email.txt:488
 #, no-wrap
 msgid "sendemail.confirm"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 msgid ""
 "Sets the default for whether to confirm before sending. Must be one of "
 "'always', 'never', 'cc', 'compose', or 'auto'. See `--confirm` in the "
@@ -55246,20 +55324,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:485
+#: en/git-send-email.txt:496
 #, no-wrap
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 msgid ""
 "To use 'git send-email' to send your patches through the GMail SMTP server, "
 "edit ~/.gitconfig to specify your account settings:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap
 msgid ""
 "[sendemail]\n"
@@ -55270,7 +55348,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 msgid ""
 "If you have multi-factor authentication set up on your Gmail account, you "
 "will need to generate an app-specific password for use with 'git "
@@ -55279,7 +55357,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:504
+#: en/git-send-email.txt:515
 msgid ""
 "If you do not have multi-factor authentication set up on your Gmail account, "
 "you will need to allow less secure app access. Visit "
@@ -55287,14 +55365,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 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:511
+#: en/git-send-email.txt:522
 #, no-wrap
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -55303,7 +55381,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 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 "
@@ -55313,7 +55391,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:522
+#: en/git-send-email.txt:533
 msgid ""
 "Note: the following core Perl modules that may be installed with your "
 "distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, "
@@ -55322,7 +55400,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:527
+#: en/git-send-email.txt:538
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
 
@@ -57149,25 +57227,26 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 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.  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.showIncludeUntracked, "
-"stash.showStat, and stash.showPatch config variables to change the default "
-"behavior."
+"recent entry in patch form).  If no `<diff-option>` is provided, the default "
+"behavior will be given by the `stash.showStat`, and `stash.showPatch` config "
+"variables. You can also use `stash.showIncludeUntracked` to set whether "
+"`--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 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 "
@@ -57175,7 +57254,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:107
+#: en/git-stash.txt:109
 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 "
@@ -57183,13 +57262,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 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` "
@@ -57197,13 +57276,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:114
+#: en/git-stash.txt:116
 #, no-wrap
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 msgid ""
 "Creates and checks out a new branch named `<branchname>` starting from the "
 "commit at which the `<stash>` was originally created, applies the changes "
@@ -57213,7 +57292,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 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 "
@@ -57222,13 +57301,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:128
+#: en/git-stash.txt:130
 #, no-wrap
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 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 "
@@ -57236,24 +57315,24 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:133
+#: en/git-stash.txt:135
 #, no-wrap
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, no-wrap
 msgid "create"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 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 "
@@ -57262,13 +57341,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:147
 #, no-wrap
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 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 "
@@ -57277,66 +57356,66 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 msgid ""
 "All ignored and untracked files are also stashed and then cleaned up with "
 "`git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, no-wrap
 msgid "--include-untracked"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, no-wrap
 msgid "--no-include-untracked"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 msgid ""
 "When used with the `push` and `save` commands, all untracked files are also "
 "stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 msgid ""
 "When used with the `show` command, show the untracked files in the stash "
 "entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, no-wrap
 msgid "--only-untracked"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 msgid ""
 "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 "
@@ -57345,24 +57424,24 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, no-wrap
 msgid "--keep-index"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, no-wrap
 msgid "--no-keep-index"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 msgid ""
 "Interactively select hunks from the diff between HEAD and the working tree "
 "to be stashed.  The stash entry is constructed such that its index state is "
@@ -57373,32 +57452,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 msgid ""
 "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` "
 "to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232
-#: en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234
+#: en/git-stash.txt:239
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 msgid ""
 "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, "
 "`store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 msgid ""
 "The new stash entry records the modified states only for the files that "
 "match the pathspec.  The index entries and working tree files are then "
@@ -57407,27 +57486,27 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 msgid ""
 "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` "
 "commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 msgid ""
 "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, "
 "the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 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 "
@@ -57437,7 +57516,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:266
 #, no-wrap
 msgid ""
 "            .----W\n"
@@ -57446,20 +57525,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 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:273
+#: en/git-stash.txt:275
 #, no-wrap
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 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 "
@@ -57468,7 +57547,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:286
 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 "
@@ -57477,7 +57556,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:292
+#: en/git-stash.txt:294
 #, no-wrap
 msgid ""
 "$ git pull\n"
@@ -57489,7 +57568,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 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 "
@@ -57498,7 +57577,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:311
+#: en/git-stash.txt:313
 #, no-wrap
 msgid ""
 "# ... hack hack hack ...\n"
@@ -57513,12 +57592,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, no-wrap
 msgid ""
 "# ... hack hack hack ...\n"
@@ -57530,13 +57609,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 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 "
@@ -57544,7 +57623,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:340
+#: en/git-stash.txt:342
 #, no-wrap
 msgid ""
 "# ... hack hack hack ...\n"
@@ -57559,13 +57638,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 msgid ""
 "If you mistakenly drop or clear stash entries, they cannot be recovered "
 "through the normal safety mechanisms.  However, you can try the following "
@@ -57574,7 +57653,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:353
+#: en/git-stash.txt:355
 #, no-wrap
 msgid ""
 "git fsck --unreachable |\n"
@@ -57583,7 +57662,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 msgid ""
 "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], "
 "linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -60086,7 +60165,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, no-wrap
 msgid "--parents"
 msgstr ""
@@ -67169,8 +67248,8 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, no-wrap
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] "
-"<path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] "
+"[-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -67569,7 +67648,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-worktree.txt:246
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid ""
+"With `lock` or with `add --lock`, an explanation why the working tree is "
+"locked."
 msgstr ""
 
 #. type: Labeled list
@@ -67826,7 +67907,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -68398,9 +68479,10 @@ msgid ""
 "<<def_revision,revision>> and you are \"merging\" another "
 "<<def_branch,branch>>'s changes that happen to be a descendant of what you "
 "have. In such a case, you do not make a new <<def_merge,merge>> "
-"<<def_commit,commit>> but instead just update to his revision. This will "
-"happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> "
-"of a remote <<def_repository,repository>>."
+"<<def_commit,commit>> but instead just update your branch to point at the "
+"same revision as the branch you are merging. This will happen frequently on "
+"a <<def_remote_tracking_branch,remote-tracking branch>> of a remote "
+"<<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -72640,20 +72722,27 @@ msgid ""
 "ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+msgid ""
+"There are several notations to specify a set of connected commits (called a "
+"\"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 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 "
@@ -72661,19 +72750,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/revisions.txt:274
+#: en/revisions.txt:277
 #, no-wrap
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 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 "
@@ -72683,13 +72772,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:283
+#: en/revisions.txt:286
 #, no-wrap
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 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 "
@@ -72698,7 +72787,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:296
+#: en/revisions.txt:299
 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 "
@@ -72708,33 +72797,71 @@ msgid ""
 "is an empty range that is both reachable and unreachable from HEAD."
 msgstr ""
 
+#. type: Plain text
+#: en/revisions.txt:306
+msgid ""
+"Commands that are specifically designed to take two distinct ranges "
+"(e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are "
+"exceptions.  Unless otherwise noted, all \"git\" commands that operate on a "
+"set of commits work on a single revision range.  In other words, writing two "
+"\"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+msgid ""
+"does *not* specify two revision ranges for most commands.  Instead it will "
+"name a single connected set of commits, i.e. those that are reachable from "
+"either B or D but are reachable from neither A or C.  In a linear history "
+"like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+msgid ""
+"because A and B are reachable from C, the revision range specified by these "
+"two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 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:303
+#: en/revisions.txt:326
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 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:313
+#: en/revisions.txt:336
 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 "
@@ -72744,7 +72871,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 msgid ""
 "While '<rev>{caret}<n>' was about specifying a single commit parent, these "
 "three notations also consider its parents. For example you can say "
@@ -72752,45 +72879,45 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/revisions.txt:319
+#: en/revisions.txt:342
 #, no-wrap
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 msgid ""
 "Include commits that are reachable from <rev> (i.e. <rev> and its "
 "ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 msgid ""
 "Exclude commits that are reachable from <rev> (i.e. <rev> and its "
 "ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 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 "
@@ -72798,13 +72925,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:334
+#: en/revisions.txt:357
 #, no-wrap
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 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 "
@@ -72812,13 +72939,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:339
+#: en/revisions.txt:362
 #, no-wrap
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 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 "
@@ -72826,13 +72953,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:344
+#: en/revisions.txt:367
 #, no-wrap
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 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 "
@@ -72840,25 +72967,25 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:349
+#: en/revisions.txt:372
 #, no-wrap
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 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:380
+#: en/revisions.txt:403
 #, no-wrap
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -74689,8 +74816,8 @@ msgstr ""
 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."
+"omit blobs that would not be required for a sparse checkout on the requested "
+"refs."
 msgstr ""
 
 #. type: Plain text
@@ -75006,45 +75133,70 @@ msgid ""
 "with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, no-wrap
+msgid "--no-commit-header"
+msgstr ""
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
 msgid ""
+"Suppress the header line containing \"commit\" and the object ID printed "
+"before the specified format.  This has no effect on the built-in formats; "
+"only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, no-wrap
+msgid "--commit-header"
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
+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:1073
+#: en/rev-list-options.txt:1081
 #, no-wrap
 msgid "--children"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 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:1078
+#: en/rev-list-options.txt:1086
 #, no-wrap
 msgid "--timestamp"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, no-wrap
 msgid "--left-right"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 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 "
@@ -75053,12 +75205,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1089
+#: en/rev-list-options.txt:1097
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -75069,18 +75221,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, no-wrap
 msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1109
+#: en/rev-list-options.txt:1117
 #, no-wrap
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -75092,13 +75244,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, no-wrap
 msgid "--graph"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 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 "
@@ -75107,25 +75259,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1119
+#: en/rev-list-options.txt:1127
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 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 "
@@ -75135,7 +75287,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1147
 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 "
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 9ce5cff444b87a26512cd3efc58bd4b0dd329346..2537feaa17ad655dad96f84fab13f69adc155f3c 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -3,10 +3,21 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
-msgstr "Report-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-05-17 17:03+0200\nPO-Revision-Date: 2021-07-24 19:33+0000\nLast-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\nLanguage-Team: none\nLanguage: pt_BR\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.7.2-dev\n"
+msgstr ""
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
+"PO-Revision-Date: 2021-07-24 19:33+0000\n"
+"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.7.2-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -66,7 +77,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr "'<inicio>' e '<fim>' s찾o opcionais. `-L <inicio>` ou `-L <inicio>`, abrange do '<inicio>' para o final do arquivo. `-L ,<fim>` abrange do come챌o ao '<fim>'."
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -78,7 +89,7 @@ msgid "Show long rev (Default: off)."
 msgstr "Exibe o rev longo (Predefini챌찾o: desligado)."
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 msgid "-t"
 msgstr "-t"
@@ -114,7 +125,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
 msgstr "Avance a hist처ria adiante em vez de retroceder. Em vez de exibir a revis찾o onde a linha apareceu, exibe a 첬ltima revis찾o na qual a linha j찼 existiu. 횋 necess찼rio um intervalo de revis천es como START..END (INICIO..FIM) onde o caminho reclamado exista em START.  Por mera conveni챗ncia, o comando `git blame --reverse START` 챕 atalho para `git blame --reverse START..HEAD`."
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -126,7 +137,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr "Siga apenas o primeiro commit da origem ao ver um commit de mesclagem. Essa op챌찾o pode ser usada para determinar quando uma linha foi incorporado em um determinado ramo em vez da sua introdu챌찾o no hist처rico geral."
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2841,8 +2852,9 @@ 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."
+#, fuzzy, 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."
+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. Defaults to true."
 msgstr "Se a mesclagem for chamada sem nenhum argumento para o commit, mescle as ramifica챌천es \"upstream\" configuradas para a ramifica챌찾o atual utilizando os seus 첬ltimos valores observados e armazenados nos seus ramos monitorados remotamente.  Os valores do `branch.<ramo atual>.merge` que nomeiam as ramifica챌천es remotas, nomeadas atrav챕s da consulta do `branch.<ramo atual>.remote` e em seguida s찾o mapeadas atrav챕s de `remote.<remoto>.fetch` para as suas ramifica챌천es coincidentes monitoradas remotamente, as pontas destas ramifica챌천es monitoradas s찾o mescladas."
 
 #. type: Labeled list
@@ -2876,139 +2888,140 @@ 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."
+#: en/config/merge.txt:42
+#, fuzzy, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr "A quantidade de arquivos que ser찾o considerados ao executar a detec챌찾o de renomea챌찾o durante uma mesclagem; caso n찾o seja especificado, a predefini챌찾o retorna para o valor existente em `diff.renameLimit`. Esta configura챌찾o n찾o tem efeito caso a detec챌찾o de renomea챌찾o esteja desativada."
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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 "Se o Git detecta renomea챌천es.  Se definido como 'false', a detec챌찾o da renomea챌찾o ser찼 desativada. Se definido como 'true', a detec챌찾o b찼sica da renomea챌찾o ser찼 ativada.  A predefini챌찾o 챕 o valor existente na op챌찾o de configura챌찾o `diff.renames`."
 
 #. type: Labeled list
-#: en/config/merge.txt:46
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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 "Se o Git detecta a renomea챌찾o de um diret처rio, afeta o que acontece no momento da mesclagem para os novos arquivos que foram adicionados para um diret처rio em um lado do hist처rico, quando este diret처rio foi renomeado do outro lado do hist처rico.  Caso `merge.directoryRenames` esteja definido como 'false', a detec챌찾o da renomea챌찾o do diret처rio ser찼 desativada, o que significa que estes novos arquivos ser찾o deixados para tr찼s no diret처rio antigo.  Caso seja definido como 'true', a detec챌찾o da renomea챌찾o do diret처rio ser찼 ativada, o que significa que esses novos arquivos ser찾o movidos para o novo diret처rio.  Caso seja definido como \"conflict\", um conflito ser찼 relatado para tais caminhos.  Caso `merge.renames` seja 'false', a vari찼vel `merge.directoryRenames` ser찼 ignorada e tratado como 'false'.  A predefini챌찾o retorna para \"conflict\"."
 
 #. type: Labeled list
-#: en/config/merge.txt:59
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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 "Diga ao Git que a representa챌찾o can척nica dos arquivos no reposit처rio mudou ao longo do tempo (os commits mais recentes registra os arquivos de texto com termina챌천es de linha tipo CRLF, por챕m os mais  recentes utilizam termina챌천es de linha tipo LF).  Em reposit처rios deste tipo o Git pode converter os dados registrados nos commits para um formato can척nico antes de realizar uma mesclagem visando reduzir conflitos desnecess찼rios.  Para obter mais informa챌천es consulte a se챌찾o \"Mesclando as ramifica챌천es com diferentes atributos de check-in/check-out\" em linkgit:gitattributes[5]."
 
 #. type: Labeled list
-#: en/config/merge.txt:69
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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 "Se deve imprimir a diferen챌a entre `ORIG_HEAD` e o resultado da mesclagem no final da mesclagem.  A predefini챌찾o 챕 `true`."
 
 #. type: Labeled list
-#: en/config/merge.txt:73
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr "Quando definido como 'true', crie automaticamente uma entrada \"stash\" tempor찼ria antes do in챠cio da opera챌찾o e aplique-a ap처s o t챕rmino.  Significa que voc챗 pode executar a mesclagem em uma 찼rvore de trabalho \"dirty\" (suja).  No entanto, utilize com cuidado: os conflitos n찾o triviais podem acontecer caso a aplica챌찾o final do \"stash\" ocorra ap처s uma mesclagem bem-sucedida.  Esta op챌찾o pode ser substitu챠da pelas op챌천es `--no-autostash` e `--autostash` do linkgit:git-merge[1].  A predefini챌찾o retorna para o valor `false`."
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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 "Controla qual a ferramenta de mesclagem 챕 utilizada pelo linkgit:git-mergetool[1].  A lista abaixo exibe os valores predefinidos que s찾o v찼lidos .  Qualquer outro valor 챕 tratado como uma ferramenta de mesclagem personalizada e requer que uma vari찼vel `mergetool.<ferramenta>.cmd` correspondente seja definida."
 
 #. type: Labeled list
-#: en/config/merge.txt:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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 "Controla qual a ferramenta de mesclagem 챕 utilizada pelo linkgit:git-mergetool[1] quando a op챌찾o `-g/--gui` for utilizada. A lista abaixo exibe os valores predefinidos que s찾o v찼lidos .  Qualquer outro valor 챕 tratado como uma ferramenta de mesclagem personalizada e requer que uma vari찼vel `mergetool.<guitool>.cmd` correspondente seja definida."
 
 #. type: Labeled list
-#: en/config/merge.txt:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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 "Controla a quantidade de sa챠da exibida pela estrat챕gia de mesclagem recursiva.  O level 0 n찾o envia nada, exceto uma mensagem final de erro, caso conflitos sejam detectados. O level 1 gera apenas os conflitos na sa챠da, o 2 gera conflitos e altera챌천es nos arquivos.  O level 5 e acima gera informa챌천es de depura챌찾o.  2 챕 o valor predefinido.  Pode ser substitu챠do pela vari찼vel de ambiente `GIT_MERGE_VERBOSITY`."
 
 #. type: Labeled list
-#: en/config/merge.txt:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr "merge.<driver>.name"
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, priority:240
 msgid "Defines a human-readable name for a custom low-level merge driver.  See linkgit:gitattributes[5] for details."
 msgstr "Define um nome leg챠vel para o controle de mesclagem personalizado de baixo n챠vel.  Para mais detalhes consulte linkgit:gitattributes[5]."
 
 #. type: Labeled list
-#: en/config/merge.txt:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr "merge.<driver>.driver"
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, priority:240
 msgid "Defines the command that implements a custom low-level merge driver.  See linkgit:gitattributes[5] for details."
 msgstr "Define o comando que ir찼 implementar o controle de mesclagem personalizado de baixo n챠vel.  Para mais detalhes consulte linkgit:gitattributes[5]."
 
 #. type: Labeled list
-#: en/config/merge.txt:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr "merge.<driver>.recursive"
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 "Nomeia um controle de mesclagem de baixo n챠vel que ser찼 utilizado durante a execu챌찾o de uma mesclagem dos ancestrais em comum.  Para mais detalhes consulte linkgit:gitattributes[5]."
@@ -3954,13 +3967,13 @@ 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:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -4044,39 +4057,41 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
-#, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+#: en/diff-options.txt:55
+#, fuzzy, priority:280
+#| msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr "Essa op챌찾o faz com que o diff gerado para a mesclagem dos commits seja mostrada no formato padr찾o. A op챌찾o `-m` ser찼 gerada apenas se a op챌찾o `-p` tamb챕m for usada. O formato predefinido pode ser alterado usando o par창metro de configura챌찾o `log.diffMerges`, onde o valor predefinido 챕 `separate`."
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, no-wrap, priority:280
 msgid "--diff-merges=first-parent"
 msgstr "--diff-merges=first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, no-wrap, priority:280
 msgid "--diff-merges=1"
 msgstr "--diff-merges=1"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr "Esta op챌찾o faz com que os commits mesclados mostrem a diferen챌a total apenas com ao que estiver relacionado com a primeira origem."
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, no-wrap, priority:280
 msgid "--diff-merges=separate"
 msgstr "--diff-merges=separate"
 
 #. type: Plain text
 #: en/diff-options.txt:66
-#, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+#, fuzzy, priority:280
+#| msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr "Faz com que os commits mesclados mostrem a diferen챌a total com rela챌찾o a cada uma das suas origens. 횋 gerado uma entrada de registro separada e um diff para cada um dos commits relacionados."
 
 #. type: Labeled list
@@ -4576,7 +4591,7 @@ msgid "Synonym for `-p --stat`."
 msgstr "횋 um sin척nimo para `-p --stat`."
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4610,7 +4625,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr "Sem esta op챌찾o, os nomes do caminho com caracteres \"incomuns\" s찾o citados como explicado na vari찼vel de configura챌찾o `core.quotePath` (veja linkgit:git-config [1])."
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4842,7 +4857,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "Ignore as altera챌천es no espa챌o na EOL (fim da linha)."
@@ -4854,7 +4869,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 "Ignore as altera챌천es na quantidade do espa챌o.  Ignora o espa챌o no final da linha e considera todas as outras sequ챗ncias de um ou mais caracteres de espa챌o como equivalentes."
@@ -5220,79 +5235,79 @@ msgid "-l<num>"
 msgstr "-l<num>"
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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 "As op챌천es `-M` e `-C` requerem um tempo de processamento O(n^2) em que n 챕 a quantidade de poss챠veis alvos para renomea챌천es/c처pia.  Esta op챌찾o impede que a detec챌찾o da a챌찾o de renomear/c처pia seja executada se a quantidade dos alvos a serem renomeados/copiados exceda o a quantidade usada."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
+msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
 
 #. type: Plain text
-#: en/diff-options.txt:609
+#: en/diff-options.txt:615
 #, 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 "Selecione apenas os arquivos Adicionados (`A`), Copiados (`C`), Exclu챠dos (`D`), Modificados (`M`), Renomeados (`R`) e que tenham o seu tipo (por exemplo, arquivo normal, link simb처lico, o subm처dulo, ...) alterado (`T`), n찾o est찼 mesclado (`U`), que seja desconhecido (`X`) ou que teve o seu emparelhamento quebrado (`B`).  Qualquer combina챌찾o dos caracteres do filtro (incluindo `none` nenhum) pode ser utilizado.  Quando `*` (Tudo ou nenhum) 챕 adicionado 횪 combina챌찾o, todos os caminhos s찾o selecionados caso haja algum arquivo que coincida com outros crit챕rios durante a compara챌찾o; caso n찾o haja nenhum arquivo que coincida com outros crit챕rios, nada ser찼 selecionado."
 
 #. type: Plain text
-#: en/diff-options.txt:612
+#: en/diff-options.txt:618
 #, priority:280
 msgid "Also, these upper-case letters can be downcased to exclude.  E.g.  `--diff-filter=ad` excludes added and deleted paths."
 msgstr "Al챕m disso, estas letras mai첬sculas podem ser transformadas em minusculas para se excluir.  `--diff-filter=ad` exclui os caminhos adicionados e exclu챠dos por exemplo."
 
 #. type: Plain text
-#: en/diff-options.txt:618
+#: en/diff-options.txt:624
 #, 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 "Observe que nem todas as diferen챌as diff podem apresentar todos os tipos. Por exemplo, diffs do 챠ndice para a 찼rvore de trabalho nunca podem ter entradas adicionadas (porque o conjunto dos caminhos inclusos no diff 챕 limitado pelo que est찼 no 챠ndice).  Da mesma forma, as entradas copiadas e renomeadas n찾o podem aparecer caso a detec챌찾o para estes tipos estiverem desativados."
 
 #. type: Labeled list
-#: en/diff-options.txt:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr "-S<texto>"
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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 "Procure por diferen챌as que alterem a quantidade de ocorr챗ncias da cadeia de caracteres usada (ou seja, adi챌찾o/exclus찾o) em um arquivo.  Destinado ao uso do scripter."
 
 #. type: Plain text
-#: en/diff-options.txt:629
+#: en/diff-options.txt:635
 #, 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 "횣til durante a produra por um bloco de c처digo exato (como uma \"struct\"), e quera saber o hist처rico deste bloco desde que ele surgiu: utilize o recurso de forma iterativa para alimentar o bloco de interesse na pr챕-imagem de volta `-S` e continue at챕 voc챗 obter a primeira vers찾o do bloco."
 
 #. type: Plain text
-#: en/diff-options.txt:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr "Os arquivos bin찼rios tamb챕m s찾o pesquisados."
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr "-G<express찾o-regular>"
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr "Procure por diferen챌as cujo texto do patch contenha as linhas adicionadas/removidas que correspondam a um `<express찾o-regular>`."
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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 "Para ilustrar a diferen챌a entre `-S<express찾o-regular> --pickaxe-regex` e `-G<express찾o-regular>`, considere um commit com o seguinte diff no mesmo arquivo:"
 
 #. type: delimited block -
-#: en/diff-options.txt:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5304,427 +5319,427 @@ msgstr ""
 "-    hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr "Enquanto o `git log -G\"frotz\\(nitfol\"` exibir찼 este commit, j찼 o `git log -S\"frotz\\(nitfol\" --pickaxe-regex` n찾o (porque a quantidade de ocorr챗ncias dessa cadeia de caracteres n찾o foi alterada) ."
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, priority:280
 msgid "Unless `--text` is supplied patches of binary files without a textconv filter will be ignored."
 msgstr "A menos que `--text` seja utilizado, os patches dos arquivos bin찼rios sem um filtro \"textconv\" ser찾o ignorados."
 
 #. type: Plain text
-#: en/diff-options.txt:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr "Para mais informa챌천es consulte a entrada 'pickaxe' em linkgit:gitdiffcore[7]."
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr "--find-object=<id-do-objeto>"
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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 "Procure pelas diferen챌as que alteram a quantidade de ocorr챗ncias do objeto especificado. Similar ao `-S`, por챕m apenas o argumento 챕 diferente pois ele n찾o procura por uma sequ챗ncia espec챠fica, mas por um ID espec챠fico do objeto."
 
 #. type: Plain text
-#: en/diff-options.txt:664
+#: en/diff-options.txt:670
 #, 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 "O objeto pode ser uma bolha ou um commit do subm처dulo. Para tamb챕m encontrar 찼rvores, fa챌a a utiliza챌찾o da op챌찾o `-t` tamb챕m no `git-log`."
 
 #. type: Labeled list
-#: en/diff-options.txt:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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 "Quando a op챌찾o `-S` ou `-G` encontra uma altera챌찾o, exiba todas as altera챌천es naquele conjunto de altera챌천es e n찾o apenas nos arquivos que contenham as altera챌천es em uma `<texto>`."
 
 #. type: Labeled list
-#: en/diff-options.txt:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, priority:280
 msgid "Treat the <string> given to `-S` as an extended POSIX regular expression to match."
 msgstr "Trate o `<texto>` utilizado com o `-S` como uma express찾o regular POSIX estendida para coincidir."
 
 #. type: Labeled list
-#: en/diff-options.txt:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr "-O<ordem-do-arquivo>"
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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 "Controlar a ordem em que os arquivos aparecem na sa챠da.  Substitui a vari찼vel de configura챌찾o `diff.orderFile` (consulte linkgit:git-config[1]).  Para cancelar a vari찼vel `diff.orderFile`, utilize `-O/dev/null`."
 
 #. type: Plain text
-#: en/diff-options.txt:693
+#: en/diff-options.txt:699
 #, 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 "A ordem da sa챠da 챕 determinada pela ordem dos padr천es bolha na <ordem-do-arquivo>.  S찾o enviados primeiro todos os arquivos cujos nomes do caminho coincidam com o primeiro padr찾o, em seguida todos os arquivos cujos nomes do caminho coincidam com o segundo padr찾o (mas n찾o ao primeiro) e assim por diante.  S찾o exibidos por 첬ltimo todos os arquivos cujos nomes do caminho n찾o coincidam com nenhum padr찾o como se houvesse um padr찾o de coincid챗ncia total impl챠cito no final do arquivo.  Caso v찼rios nomes do caminho tenham a mesma classifica챌찾o (eles coincidem com o mesmo padr찾o, mas n찾o com os padr천es anteriores), a sua ordem na sa챠da em rela챌찾o 횪 outra 챕 a ordem normal."
 
 #. type: Plain text
-#: en/diff-options.txt:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr "A <ordem-do-arquivo> 챕 analisado da seguinte maneira:"
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr "As linhas em branco s찾o ignoradas para que possam ser utilizadas como separadores, facilitando a leitura."
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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 "As linhas que come챌am com um hash (\"`#`\") s찾o ignoradas para que possam ser utilizadas como coment찼rios.  Adicione uma barra invertida (\"`\\`\") ao in챠cio do padr찾o caso ele comece com um hash."
 
 #. type: Plain text
-#: en/diff-options.txt:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr "Cada outra linha quem contenha um 첬nico padr찾o."
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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 "Os padr천es t챗m a mesma sintaxe e sem창ntica que os padr천es utilizados para fnmatch(3) sem a flag `FNM_PATHNAME`, exceto que um nome do caminho tamb챕m coincida com um padr찾o caso a remo챌찾o de qualquer quantidade dos componentes finais do nome do caminho coincida com o padr찾o.  O padr찾o \"`foo*bar`\" coincide com \"`fooasdfbar`\" e \"`foo/bar/baz/asdf`\" mas n찾o com \"`foobarx`\" por exemplo."
 
 #. type: Labeled list
-#: en/diff-options.txt:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, no-wrap, priority:280
 msgid "--skip-to=<file>"
 msgstr "--skip-to=<arquivo>"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, no-wrap, priority:280
 msgid "--rotate-to=<file>"
 msgstr "--rotate-to=<arquivo>"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr "Descarte os arquivos da sa챠da antes do <arquivo> (ou seja, 'pule para'), ou mova-os para o final da sa챠da (ou seja, 'redirecione para').  Estas op챌천es foram inventadas para uso do comando `git difftool` e podem n찾o ser muito 첬teis para outra coisa."
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr "-R"
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, priority:280
 msgid "Swap two inputs; that is, show differences from index or on-disk file to tree contents."
 msgstr "Troque as duas entradas; isto 챕, exiba as diferen챌as do 챠ndice ou do arquivo no disco para o conte첬do da 찼rvore."
 
 #. type: Labeled list
-#: en/diff-options.txt:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr "--relative[=<caminho>]"
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr "Com esta op챌찾o, quando executado a partir de um subdiret처rio do projeto, pode-se dizer para excluir as altera챌천es fora do diret처rio e exibir os nomes do caminho relativos a ele.  Quando n찾o estiver em um subdiret처rio (em um reposit처rio simples por exemplo), 챕 poss챠vel definir em qual subdiret처rio tornar a sa챠da relativa, utilizando um <caminho> como argumento. A op챌찾o `--no-relative` pode ser utilizada para contrapor ambas as op챌천es de configura챌찾o `diff.relative` e a anterior `--relative`."
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr "Trate todos os arquivos como texto."
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr "Ignore o retorno do carro no final da linha durante uma compara챌찾o."
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr "Ignore o espa챌o durante a compara챌찾o das linhas.  Ignore as diferen챌as mesmo que uma linha tenha espa챌os quando a outra linha n찾o tiver nenhuma."
 
 #. type: Labeled list
-#: en/diff-options.txt:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr "Ignore as altera챌천es cujas linhas estejam todas em branco."
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr "-I<express찾o-regular>"
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, no-wrap, priority:280
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-matching-lines=<express찾o-regular>"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr "Ignore as altera챌천es cujas linhas coincidam com a <express찾o-regular>. Esta op챌찾o pode ser usada mais de uma vez."
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr "--inter-hunk-context=<linhas>"
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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 "Exiba o contexto entre as diferen챌as, at챕 a quantidade de linhas usada, fundindo assim as que est찾o pr처ximas umas das outras.  A predefini챌찾o retorna para `diff.interHunkContext` ou 0 caso a op챌찾o de configura챌찾o n찾o esteja definida."
 
 #. type: Labeled list
-#: en/diff-options.txt:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr "-W"
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr "Exiba toda a fun챌찾o como linhas de contexto para cada altera챌찾o.  O nome da fun챌찾o 챕 determinada da mesma maneira que o 'git diff' lida com os peda챌os do cabe챌alhos do patch (consulte 'Definindo um cabe챌alho personalizado do hunk' em linkgit:gitattributes[5])."
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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 "Fa챌a com que o programa encerre com c처digos semelhantes ao diff(1).  Ou seja, encerra com 1 caso haja diferen챌as ou 0 quando n찾o houver."
 
 #. type: Labeled list
-#: en/diff-options.txt:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr "Faz com que o programa trabalhe em sil챗ncio. Implica no uso da op챌찾o `--exit-code`."
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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 "Permitir que um auxiliar diff externo seja executado. Caso um controlador diff externo seja definido com linkgit:gitattributes[5], ser찼 necess찼rio a utiliza챌찾o desta op챌찾o com linkgit:git-log[1] e seus companheiros."
 
 #. type: Labeled list
-#: en/diff-options.txt:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr "N찾o permitir o uso de um controladores diff externo."
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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 "Permita (ou n찾o permita) a execu챌찾o dos filtros externos para a convers찾o do texto durante a compara챌찾o dos arquivos bin찼rios. Para mais detalhes consulte linkgit:gitattributes[5]. Como os filtros \"textconv\" s찾o normalmente uma convers찾o unidirecional, o diff resultante 챕 leg챠vel para as pessoas por챕m n찾o pode ser aplicado. Por este motivo, 챕 predefinido que os filtros \"textconv\" estejam ativos apenas para os comandos linkgit:git-diff[1] e linkgit:git-log[1], mas n찾o para os comandos linkgit:git-format-patch[1] ou comandos \"diff\" que possam ser redirecionados."
 
 #. type: Labeled list
-#: en/diff-options.txt:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr "--ignore-submodules[=<quando>]"
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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 "Ignore as altera챌천es nos subm처dulos durante a gera챌찾o dos diffs. O `<quando>` pode ser \"none\" (nenhum), \"untracked\" (sem monitoramento/rastreamento), \"dirty\" (sujo) ou \"all\" (todos), que 챕 a predefini챌찾o.  O \"none\" considera o subm처dulo modificado quando houver arquivos n찾o estejam rastreados, modificados ou o seu `HEAD` seja diferente do commit registrado no superprojeto, pode ser utilizado para substituir qualquer configura챌찾o da op챌찾o 'ignore' (ignorar) em  linkgit:git-config[1] ou linkgit:gitmodules[5]. Quando o \"untracked\" 챕 utilizado, os subm처dulos n찾o s찾o considerados sujos quando houver apenas  um conte첬do sem rastreamento (por챕m o monitoramento de altera챌천es do seu conte첬do continua) O uso de \"dirty\" ignora todas as altera챌천es na 찼rvore de trabalho dos subm처dulos, apenas as altera챌천es nos commits armazenados no superprojeto s찾o exibidos (este era o comportamento anterior at챕 a vers찾o 1.7.0). O uso de \"all\" oculta todas as altera챌천es nos subm처dulos."
 
 #. type: Labeled list
-#: en/diff-options.txt:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr "--src-prefix=<prefixo>"
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr "Exiba o prefixo da origem utilizada em vez de \"a/\"."
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr "--dst-prefix=<prefixo>"
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr "Exiba o prefixo do destino utilizado em vez de \"b/\"."
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr "N찾o exiba nenhum prefixo da origem ou destino."
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr "--line-prefix=<prefixo>"
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr "Prefira um prefixo adicional em cada linha produzida."
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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 "횋 predefinido que as entradas adicionadas atrav챕s do comando \"git add -N\" apare챌am como uma cadeia de caracteres vazia existente com o comando \"git diff\" e um novo arquivo com \"git diff --cached\".  Esta op챌찾o faz com que a entrada apare챌a como um novo arquivo no \"git diff\" e inexistente no \"git diff --cached\". Esta op챌찾o pode ser revertida com `--ita-visible-in-index`. Ambas as op챌천es s찾o experimentais e podem ser removidas no futuro."
 
 #. type: Plain text
-#: en/diff-options.txt:846
+#: en/diff-options.txt:852
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr "Para uma explica챌찾o mais detalhada sobre estas op챌천es comuns, consulte tamb챕m linkgit:gitdiffcore[7]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5862,55 +5877,74 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr "O argumento para esta op챌찾o pode ser um \"ref\" aos nomes de refer챗ncia, uma refer챗ncia ou o (possivelmente abreviado) SHA-1 de um commit. Especificar um agrupamento 챕 o equivalente a utilizar esta op챌찾o v찼rias vezes, uma para cada nome \"ref\" coincidente."
 
 #. type: Plain text
-#: en/fetch-options.txt:67
-#, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+#: en/fetch-options.txt:68
+#, fuzzy, priority:220
+#| msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr "Consulte tamb챕m a vari찼vel de configura챌찾o `fetch.negotiationAlgorithm` documentada em linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr "Exiba apenas o que seria feito, sem fazer quaisquer altera챌천es."
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr "Escreva a lista de refer챗ncias remotas buscadas no arquivo `FETCH_HEAD` diretamente no`$GIT_DIR`.  Este 챕 o padr찾o. Usando a op챌찾o `--no-write-fetch-head` na linha de comando diz ao Git para n찾o escrever o arquivo. Com op챌찾o `--dry-run`, o arquivo nunca 챕 escrito."
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr "Quando 'git fetch' 챕 utilizado com `<src>:<dst>` \"refspec\" ele pode se recusar a atualizar o ramo local como discutido"
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5920,397 +5954,397 @@ msgstr ""
 "\tlinkgit:git-fetch[1].\n"
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr "\tna parte `<refspec>` abaixo.\n"
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr "\tEsta op챌찾o sobrescreve esta verifica챌찾o.\n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr "Mantenha o pacote que foi baixado."
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr "Permita que v찼rios argumentos <reposit처rio> e <grupo> sejam utilizados. Nenhum `<refspec>` pode ser utilizado."
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr "Caso seja necess찼rio, execute o `git maintenance run --auto` no final para executar a manuten챌찾o autom찼tica do reposit처rio. (`--[no-]auto-gc` is a synonym.)  A predefini챌찾o 챕 sempre ativo."
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr "Grave um grafo do commit ap처s a captura remota. Este sobrescreve a configura챌찾o `fetch.writeCommitGraph`."
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr "Altere o refspec configurado para colocar todos os refs no namespace `refs/prefetch/`. Consulte a tarefa `prefetch` em linkgit:git-maintenance[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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 "Antes de capturar, remova as refer챗ncias do rastreamento remoto que n찾o exista mais remotamente.  As tags n찾o est찾o sujeitas a remo챌찾o caso sejam capturadas apenas por causa do acompanhamento autom찼tico da tag predefinida ou devido a uma op챌찾o `--tags`.  No entanto, caso as tags seja capturadas por causa de um \"refspec\" expl챠cito (na linha de comandos ou na configura챌찾o remota, por exemplo, caso haja uma clonagem remota com a op챌찾o `--mirror`), elas tamb챕m estar찾o sujeitas a remo챌찾o. Informar a op챌찾o `--prune-tags` 챕 uma abrevia챌찾o para informar a tag refspec."
 
 #. type: Plain text
-#: en/fetch-options.txt:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr "Consulte a se챌찾o de PRUNING abaixo para mais detalhes."
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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 "Antes de capturar, remova as tags locais que n찾o existam mais remotamente caso a op챌찾o `--prune` esteja ativa. Esta op챌찾o deve ser utilizada com mais cuidado, ao contr찼rio da op챌찾o `--prune`, ela remover찼 todas as refer챗ncias locais (tags locais) que forem criadas. Esta op챌찾o 챕 um atalho para informar a tag expl챠cita refspec junto com a op챌찾o `--prune`, consulte a discuss찾o sobre isso em sua documenta챌찾o."
 
 #. type: Labeled list
-#: en/fetch-options.txt:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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 "횋 predefinido que as tags que apontem para os objetos baixados do reposit처rio remoto sejam capturados e armazenadas localmente.  Esta op챌찾o desativa essa tag autom찼tica a seguir. O comportamento remoto predefinido pode ser especificado com a configura챌찾o remote.<nome>.tagOpt. Consulte linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr "--refmap=<refspec>"
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr "Ao capturar as refs listadas na linha de comando, utilize o \"refspec\" informado (pode ser utilizado mais de uma vez) para mapear os refs para as ramifica챌천es rastreadas remotamente em vez dos valores das vari찼veis da configura챌찾o `remote.*.fetch` para o reposit처rio remoto.  Informe um `<refspec>` vazio 횪 op챌찾o `--refmap` faz com que o Git ignore os \"refspecs\" configurados e confie inteiramente nos \"refspecs\" informados como os argumentos da linha de comando. Para mais detalhes consulte a se챌찾o \"Configura챌찾o dos Ramos Monitorados Remotamente\"."
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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 "Capture todas as tags remotas (ou seja, capture as tags remotas `refs/tags/*` nas tags locais com o mesmo nome), al챕m de qualquer outra coisa que possa ser capturada.  O uso desta op챌찾o por si s처 n찾o sujeita a remo챌찾o das tags, mesmo que `--prune` seja utilizado (embora as tags possam ser removidas de qualquer maneira, caso tamb챕m sejam o destino de um \"refspec\" expl챠cito; consulte `--prune`)."
 
 #. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr "--recurse-submodules[=yes|on-demand|no]"
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr "Essa op챌찾o controla se e sob quais condi챌천es os novos commits dos subm처dulos preenchidos tamb챕m devem ser capturadas. Pode ser utilizado como uma op챌찾o booleana para desativar completamente a recurs찾o quando definido como 'no' ou para recursar incondicionalmente em todos os sub-m처dulos preenchidos quando definido como 'sim', que 챕 a predefini챌찾o quando esta op챌찾o 챕 utilizada sem qualquer valor. Utilize 'on demand' para re-examinar apenas em um subm처dulo preenchido quando o superprojeto recuperar um commit que atualize a refer챗ncia do subm처dulo para um commit que ainda n찾o esteja no clone do subm처dulo local. 횋 predefinido que 'on demand' seja utilizado, a menos que `fetch.recurseSubmodules` seja definido (consulte linkgit:git-config[1])."
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr "--jobs=<n>"
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr "A quantidade de processos paralelos que ser찾o utilizados para todas as formas de captura."
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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 "Caso a op챌찾o `--multiple` seja utilizada, os diferentes ramos remotos ser찾o capturados em paralelo. Caso v찼rios subm처dulos sejam capturados, estes ser찾o capturados em paralelo. Para control찼-los de forma independente, utilize as defini챌천es da configura챌찾o `fetch.parallel` e `submodule.fetchJobs` (consulte linkgit:git-config[1])."
 
 #. type: Plain text
-#: en/fetch-options.txt:201
+#: en/fetch-options.txt:210
 #, priority:220
 msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
 msgstr "Normalmente, as capturas remotas dos m첬ltiplos ramos de forma paralela e recursiva ser찾o mais r찼pidas. A predefini챌찾o 챕 realizar as capturas em sequ챗ncia e n찾o em paralelo."
 
 #. type: Labeled list
-#: en/fetch-options.txt:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, priority:220
 msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
 msgstr "Desative a captura recursiva dos subm처dulos (tem o mesmo efeito que utilizar a op챌찾o `--recurse-submodules=no`)."
 
 #. type: Labeled list
-#: en/fetch-options.txt:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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 "Caso a captura remota seja bem sucedida, uma refer챗ncia de rastreamento `add` ser찼 adicionada ao upstream, utilizado pelo argumento `less` linkgit:git-pull[1] e outros comandos. Para mais informa챌천es, consulte `branch.<nome>.merge` e `branch.<nome>.remote` em linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr "--submodule-prefix=<caminho>"
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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 "Anexe o `<caminho>` para os caminhos impressos nas mensagens informativas como \"Recolhendo o subm처dulo foo\".  Esta op챌찾o 챕 utilizada internamente quando recorrer as subm처dulos."
 
 #. type: Labeled list
-#: en/fetch-options.txt:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr "--recurse-submodules-default=[yes|on-demand]"
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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 "Esta op챌찾o 챕 utilizada internamente para prover temporariamente um valor n찾o negativo da forma predefinida para a op챌찾o `--recurse-submodules`.  Todos os outros m챕todos de configurar a recurs찾o do subm처dulo `fetch` (como as configura챌천es em linkgit:gitmodules[5] e linkgit:git-config[1]) sobrescreva esta op챌찾o utilizando `--[no-]recurse-submodules` diretamente."
 
 #. type: Labeled list
-#: en/fetch-options.txt:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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 "횋 predefinido que o 'git fetch' se recuse a atualizar o cabe챌alho que corresponde ao ramo atual.  Esta flag desativa esta verifica챌찾o.  Serve apenas para a utiliza챌찾o interna do 'git pull' para se comunicar com o 'git fetch', a menos que esteja implementando a sua pr처pria porcelana, voc챗 n찾o deve utiliz찼-la."
 
 #. type: Labeled list
-#: en/fetch-options.txt:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr "--upload-pack <pacote-para-envio>"
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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 o reposit처rio 챕 informado para capturar e que seja manipulado por 'git fetch-pack', o `--exec=<upload-pack>` 챕 passado para o comando utilizar um caminho alternativo para o comando executado na outra extremidade."
 
 #. type: Labeled list
-#: en/fetch-options.txt:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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 "Repasse a op챌찾o `--quiet` para o `git-fetch-pack` e silencie qualquer outro comando git utilizado internamente. O progresso n찾o 챕 relatado para o fluxo de erro predefinido."
 
 #. type: Labeled list
-#: en/fetch-options.txt:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "Seja loquaz."
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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 "횋 predefinido que a condi챌찾o geral do progresso seja relatada no fluxo de erros quando estiver conectado em um terminal, a menos que `-q` seja utilizado. Esta op챌찾o imp천em a condi챌찾o geral do progresso, mesmo que o fluxo de erro predefinido n찾o seja direcionado para um terminal."
 
 #. type: Labeled list
-#: en/fetch-options.txt:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr "-o <op챌찾o>"
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<op챌찾o>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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 "Transmita a sequ챗ncia usada para o servidor ao se comunicar utilizando o protocolo vers찾o 2.  A sequ챗ncia informada n찾o deve conter um caractere `NUL` ou `LF`.  O tratamento das op챌천es do servidor, incluindo os desconhecidos, 챕 espec챠fico do servidor.  Quando a op챌찾o `--server-option=<op챌찾o>` forem utilizadas v찼rias vezes, todos ser찾o enviados para o outro lado na ordem listada na linha de comando."
 
 #. type: Labeled list
-#: en/fetch-options.txt:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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 "횋 predefinido que o Git verifique se a atualiza챌찾o do ramo foi imposta durante uma captura. Pode ser desativado por meio de `fetch.showForcedUpdates`, por챕m a op챌찾o `--show-forced-updates garante que essa verifica챌찾o ocorra.  Consulte linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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 "횋 predefinido que o Git verifique se a atualiza챌찾o do ramo foi imposta durante uma captura. Utilize a op챌찾o `--no-show-forced-updates` ou defina `fetch.showForcedUpdates` como to `false` para ignorar esta verifica챌찾o por quest천es de desempenho. Se utilizada durante o `git-pull`, a op챌찾o `--ff-only` ainda verificar찼 quais as atualiza챌천es foram impostas antes de tentar uma atualiza챌찾o r찼pida. Consulte linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr "Utilize apenas os endere챌os IPv4, ignorando os endere챌os IPv6."
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr "Utilize apenas os endere챌os IPv6, ignorando os endere챌os IPv4."
@@ -6398,13 +6432,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "Consulte linkgit:git-commit[1] para ver as formas alternativas de adicionar um conte첬do a um commit."
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OP횉횛ES"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr "<pathspec>..."
@@ -6434,7 +6468,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr "Permitir a inclus찾o dos arquivos que j찼 foram ignorados por outros motivos."
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6464,13 +6498,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr "Efetivamente executa o comando `add --interactive` por챕m ignora o menu do comando inicial e salta diretamente para o subcomando` patch`.  Para mais detalhes consulte ``modo interativo''."
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6644,31 +6678,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr "Substitua o bit execut찼vel dos arquivos que foram adicionados.  Apenas no 챠ndice que o bit execut찼vel 챕 alterado, os arquivos no disco permanecem inalterados."
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<arquivo>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr "O \"pathspec\" 챕 passado com `<arquivo>` em vez dos argumentos da linha de comando. Caso o `<arquivo>` seja exatamente `-`, a entrada padr찾o ser찼 utilizada. Os elementos do \"pathspec\" s찾o separados por caracteres de t챕rmino de linha `LF` ou `CR/LF`. Os elementos do \"pathspec\" podem ser citados conforme explicado na vari찼vel de configura챌찾o `core.quotePath` (consulte linkgit:git-config[1]). Consulte tamb챕m op챌찾o `--pathspec-file-nul` e o global `--literal-pathspecs`."
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr "S처 faz algum sentido caso seja utilizado junto com a op챌찾o `--pathspec-from-file`. Os elementos \"pathspec\" s찾o separados com caracteres `NUL` e todos os outros caracteres s찾o considerados de forma literal (incluindo as novas linhas e as cita챌천es)."
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr "\\--"
@@ -6680,7 +6714,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr "Esta op챌찾o pode ser utilizada para separar as op챌천es da linha de comandos da lista dos arquivos (첬til quando os nomes do arquivo puderem ser confundidos com as op챌천es da linha de comando)."
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "EXEMPLOS"
@@ -7058,7 +7092,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr "modificando o conte첬do do contexto ou as linhas de remo챌찾o"
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "VEJA TAMB횋M"
@@ -7070,13 +7104,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "Parte do conjunto linkgit:git[1]"
@@ -7106,7 +7140,16 @@ msgid ""
 "\t [--quoted-cr=<action>]\n"
 "\t [(<mbox> | <Maildir>)...]\n"
 "'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
-msgstr "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n\t [--whitespace=<op챌찾o>] [-C<n>] [-p<n>] [--directory=<dir>]\n\t [--exclude=<caminho>] [--include=<caminho>] [--reject] [-q | --quiet]\n\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<formato>]\n\t [--quoted-cr=<a챌찾o>]\n\t [(<mbox> | <Maildir>)...]\n'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
+msgstr ""
+"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
+"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
+"\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n"
+"\t [--whitespace=<op챌찾o>] [-C<n>] [-p<n>] [--directory=<dir>]\n"
+"\t [--exclude=<caminho>] [--include=<caminho>] [--reject] [-q | --quiet]\n"
+"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<formato>]\n"
+"\t [--quoted-cr=<a챌찾o>]\n"
+"\t [(<mbox> | <Maildir>)...]\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
 
 #. type: Plain text
 #: en/git-am.txt:27
@@ -7515,7 +7558,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr "Exiba uma mensagem onde o `git am` tenha parado por causa dos conflitos.  Caso `raw` seja utilizado, exiba o conte첬do bruto da mensagem do e-mail; no caso do `diff`, exiba apenas a por챌찾o relacionada ao diff.  A predefini챌찾o retorna para \"raw\" (bruto/puro)."
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr "DISCUSS횄O"
@@ -7735,7 +7778,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr "Em vez de aplicar o patch, verifique se o patch 챕 aplic찼vel 횪 찼rvore de trabalho atual ou ao arquivo do 챠ndice assim como, detecte os erros.  Desativa o \"apply\" (aplicar)."
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -8035,7 +8078,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr "Quando o comando `git apply` for utilizado como um \"better GNU patch\" (patch melhor do que o do GNU), o usu찼rio pode encaminhar a op챌찾o `--unsafe-paths` para substituir esta verifica챌찾o de seguran챌a.  Esta op챌찾o n찾o tem efeito quando a op챌찾o `--index` ou `--cached` estiver em uso."
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr "CONFIGURA횉횄O"
@@ -8311,7 +8354,7 @@ msgid "Format of the resulting archive: 'tar' or 'zip'. If this option is not gi
 msgstr "Formato do arquivo resultante: 'tar' ou 'zip'. Caso esta op챌찾o n찾o seja utilizada e o arquivo na sa챠da for definido, o tipo do formato ser찼 deduzido atrav챕s do nome do arquivo, quando for poss챠vel (ao gravar como \"foo.zip\" faz com que a sa챠da esteja no formato zip por exemplo). Caso contr찼rio, o formato gerado ser찼 `tar`."
 
 #. type: Labeled list
-#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8449,7 +8492,7 @@ msgid "zip"
 msgstr "zip"
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -11520,7 +11563,9 @@ msgstr "Por exemplo, o comando `--batch` sem um formato personalizado produziria
 msgid ""
 "<oid> SP <type> SP <size> LF\n"
 "<contents> LF\n"
-msgstr "<oid> SP <tipo> SP <tamanho> LF\n<conte첬do> LF\n"
+msgstr ""
+"<oid> SP <tipo> SP <tamanho> LF\n"
+"<conte첬do> LF\n"
 
 #. type: Plain text
 #: en/git-cat-file.txt:244
@@ -12593,7 +12638,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr "Isto 챕 semelhante ao modo anterior, por챕m permite usar a interface interativa para exibir o \"diff\" gerado e escolher quais os blocos utilizar no resultado.  Veja abaixo a descri챌찾o da op챌찾o `--patch`."
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr "Silencioso, suprima as mensagens de feedback."
@@ -12977,7 +13022,7 @@ msgid "Limits the paths affected by the operation."
 msgstr "Limita os caminhos afetados pela opera챌찾o."
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr "Para mais detalhes sobre a sintaxe <pathspec>, veja a entrada 'pathspec' em linkgit:gitglossary[7]."
@@ -14501,7 +14546,16 @@ msgid ""
 "\t  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
 "\t  [--filter=<filter>] [--] <repository>\n"
 "\t  [<directory>]\n"
-msgstr "'git clone' [--template=<diret처rio-modelo>]\n\t  [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n\t  [-o <nome>] [-b <nome>] [-u <upload-pack>] [--reference <reposit처rio>]\n\t  [--dissociate] [--separate-git-dir <dir git>]\n\t  [--depth <profundidade>] [--[no-]single-branch] [--no-tags]\n\t  [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n\t  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n\t  [--filter=<filter>] [--] <reposit처rio>\n\t  [<diret처rio>]\n"
+msgstr ""
+"'git clone' [--template=<diret처rio-modelo>]\n"
+"\t  [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
+"\t  [-o <nome>] [-b <nome>] [-u <upload-pack>] [--reference <reposit처rio>]\n"
+"\t  [--dissociate] [--separate-git-dir <dir git>]\n"
+"\t  [--depth <profundidade>] [--[no-]single-branch] [--no-tags]\n"
+"\t  [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n"
+"\t  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
+"\t  [--filter=<filter>] [--] <reposit처rio>\n"
+"\t  [<diret처rio>]\n"
 
 #. type: Plain text
 #: en/git-clone.txt:30
@@ -14522,7 +14576,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr "Esta configura챌찾o predefinida 챕 obtida atrav챕s da cria챌찾o de refer챗ncias nos cabe챌alhos das ramifica챌천es remotas em `refs/remotos/origem` e inicializando as vari찼veis de configura챌찾o `remote.origin.url` e `remote.origin.fetch`."
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -15356,7 +15410,7 @@ msgid "Discussion"
 msgstr "Discuss찾o"
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr "ARQUIVOS"
@@ -15397,7 +15451,15 @@ msgid ""
 "\t   [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "\t   [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n"
 "\t   [--] [<pathspec>...]\n"
-msgstr "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<modo>] [--amend]\n\t   [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]\n\t   [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n\t   [--allow-empty-message] [--no-verify] [-e] [--author=<autor>]\n\t   [--date=<data>] [--cleanup=<modo>] [--[no-]status]\n\t   [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n\t   [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n\t   [--] [<pathspec>...]\n"
+msgstr ""
+"'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<modo>] [--amend]\n"
+"\t   [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]\n"
+"\t   [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n"
+"\t   [--allow-empty-message] [--no-verify] [-e] [--author=<autor>]\n"
+"\t   [--date=<data>] [--cleanup=<modo>] [--[no-]status]\n"
+"\t   [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t   [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n"
+"\t   [--] [<pathspec>...]\n"
 
 #. type: Plain text
 #: en/git-commit.txt:28
@@ -15461,8 +15523,9 @@ msgstr "Diz ao comando para preparar automaticamente os arquivos que foram modif
 
 #. type: Plain text
 #: en/git-commit.txt:78
-#, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+#, fuzzy, priority:280
+#| msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr "Utilize a interface interativa do patch para selecionar quais as altera챌천es ser찾o aplicadas ao commit. Para mais detalhes, consulte linkgit:git-add[1]."
 
 #. type: Labeled list
@@ -15592,7 +15655,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr "Ao executar um ensaio, informe a sa챠da no formato porcelana. Para mais detalhes, consulte linkgit:git-status[1]. Implica no uso da op챌찾o `--dry-run`."
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15604,7 +15667,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr "Ao executar um ensaio, informe a sa챠da no formato curto.  Implica no uso da op챌찾o `--dry-run`."
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -16354,557 +16417,553 @@ msgid "On success, the command returns the exit code 0."
 msgstr "Em casos bem sucedidos o comando retorna o c처digo 0."
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr "O comportamento predefinido 챕 substituir pelo menos uma linha. Isso substitui todas as linhas que coincidam com a chave (e opcionalmente ao `value-pattern`)."
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr "Adiciona uma nova linha 횪 op챌찾o, sem alterar nenhum valor j찼 existente.  횋 o mesmo que informar '^$' como o `value-pattern` na op챌찾o `--replace-all`."
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr "Obtenha o valor para uma determinada chave (opcionalmente filtrada por uma express찾o regular que coincida com o valor). Retorna o c처digo de erro '1' caso a chave n찾o seja encontrada e o 첬ltimo valor caso v찼rios valores da chave sejam encontrados."
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr "Como get, mas retorna todos os valores para uma chave com v찼rios valores."
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr "Como a op챌찾o `--get-all`, por챕m interpreta o nome como uma express찾o regular e escreve os nomes das chaves.  A coincid챗ncia comum da express찾o regular 챕 sens챠vel a mai첬sculas e min첬sculas, 챕 feita contra uma vers찾o canonizado da chave onde a se챌찾o e os nomes das vari찼veis s찾o min첬sculas, por챕m os nomes das subse챌천es n찾o s찾o."
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr "--get-urlmatch nome URL"
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr "Quando 챕 utilizado em um nome com duas partes `section.key`, o valor da `section.<url>.key` cuja parte da <url> coincida para o retorno da melhor URL informada (caso essa chave n찾o exista, o valor do `section.key` ser찼 usado como substituto).  Quando receber apenas a se챌찾o como nome, fa챌a-o para todas as chaves da se챌찾o e liste-as.  Retorna o c처digo de erro 1 caso nenhum valor seja encontrado."
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr "Para escrever op챌천es: escreva para o arquivo global `~/.gitconfig` em vez do reposit처rio `.git/config`, escreva para o arquivo `$XDG_CONFIG_HOME/git/config` se este arquivo existir e o arquivo `~/.gitconfig` n찾o faz."
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr "Para op챌천es de leitura: leia somente do global `~/.gitconfig` e de` $XDG_CONFIG_HOME/git/config` ao inv챕s de todos os arquivos dispon챠veis."
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr "Consulte tamb챕m <<ARQUIVOS>>."
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr "Para op챌천es de escrita: escreva para o `$(prefixo)/etc/gitconfig` do sistema em vez do reposit처rio `.git/config`."
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr "Para op챌천es de leitura: leia somente do `$(prefixo)/etc/gitconfig` em todo o sistema, e n찾o de todos os arquivos dispon챠veis."
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr "Para as op챌천es de escrita: escreva no arquivo do reposit처rio `.git/config`.  Este 챕  o comportamento predefinido."
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr "Para as op챌천es da leitura: leia somente no reposit처rio `.git/config` em vez de todos os arquivos dispon챠veis."
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr "Semelhante a op챌찾o `--local`, exceto que o a op챌찾o de configura챌찾o `.git/config.worktree` 챕 lido ou gravado caso `extensions.worktreeConfig` existir. Caso n찾o seja, 챕 o mesmo que a op챌찾o `--local`."
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr "-f arquivo-config"
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr "--file arquivo-config"
 
 #. type: Plain text
-#: en/git-config.txt:147
-#, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
-msgstr "Utilize o arquivo de configura챌찾o informado em vez daquele especificado por GIT_CONFIG."
+#: en/git-config.txt:149
+#, fuzzy, priority:100
+#| msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr "Para op챌천es de escrita: escreva para o `$(prefixo)/etc/gitconfig` do sistema em vez do reposit처rio `.git/config`."
+
+#. type: Plain text
+#: en/git-config.txt:152
+#, fuzzy, priority:100
+#| msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
+msgid "For reading options: read only from the specified file rather than from all available files."
+msgstr "Para as op챌천es da leitura: leia somente no reposit처rio `.git/config` em vez de todos os arquivos dispon챠veis."
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr "--blob blob"
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr "횋 semelhante a op챌찾o `--file` por챕m utilize a bolha informada em vez de um arquivo. Como por exemplo, 챕 poss챠vel utilizar 'master:.gitmodules' para ler os valores de um arquivo '.gitmodules' no ramo \"master\". Para conhecer uma lista completa das diferentes maneiras de soletrar os nomes das bolhas, consulte a se챌찾o \"DEFININDO AS REVIS횛ES\" em linkgit:gitrevisions[7]."
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr "Remova a se챌찾o dada do arquivo de configura챌찾o."
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr "Renomeie a se챌찾o dada para um novo nome."
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr "Remove do arquivo de configura챌찾o a linha correspondente 횪 chave."
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr "Remove do arquivo de configura챌찾o todas as linhas que correspondam 횪 chave."
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr "Lista todas as vari찼veis definidas no arquivo de configura챌찾o, junto com seus valores."
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr "Quando utilizado com o argumento `value-pattern`, trate o `value-pattern` como uma string exata em vez de uma express찾o regular. Isto restringir찼 os pares nome e o valor que s찾o coincididos apenas com aqueles onde o valor 챕 exatamente igual ao `value-pattern`."
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr "--type <tipo>"
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr "'git config' ir찼 assegurar que qualquer entrada ou sa챠da 챕 v찼lida sob a(s) restri챌찾o(천es) de tipo dada, e ir찼 canonicalizar os valores de sa챠da na forma can척nica do `<tipo>`'s."
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr "Os `<tipo>`'s v찼lidos incluem:"
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr "'bool': canoniza os valores como 'true' ou 'false'."
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr "'int': canoniza os valores como n첬meros decimais simples. Um sufixo opcional com 'k', 'm' ou 'g' far찼 com que o valor seja multiplicado por 1024, 1048576 ou 1073741824 na entrada."
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr "'bool-or-int': canoniza de acordo com 'bool' ou 'int', como descrito acima."
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr "'path': canonize ao adicionar um sinal `~` no come챌o para o valor `$HOME` e `~user` no diret처rio home do usu찼rio especificado. Este especificador n찾o tem efeito durante a defini챌찾o do valor (por챕m voc챗 pode utilizar o comando `git config section.variable ~ /` na linha de comando para permitir que o seu shell fa챌a a expans찾o.)"
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr "'data validade': canoniza convertendo a partir de uma cadeia com data fixa ou relativa a um registro de data e hora. Este especificador n찾o tem efeito quando for definir o valor."
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr "'color': Quando obtiver um valor, canonize atrav챕s da convers찾o para uma sequ챗ncia no padr찾o ANSI de cor. Ao definir um valor, uma verifica챌찾o 챕 realizada para garantir que o valor informado seja canoniz찼vel como uma cor ANSI, por챕m ser찼 escrito como estiver."
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr "Op챌천es hist처ricas para selecionar um especificador de tipo. Em vez disso, prefira op챌찾o `--type` (veja acima)."
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr "Indetermine o tipo do especificador definido anteriormente (caso tenha sido definido anteriormente). Esta op챌찾o solicita que o comando 'git config' n찾o canonize a vari찼vel recuperada.  A op챌찾o `--no-type` n찾o tem qualquer efeito sem a op챌찾o `--type=<tipo>` ou `--<tipo>`."
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr "Para todas as op챌천es que gerem valores e/ou chaves, sempre finalize os valores com o caractere nulo (em vez de uma nova linha). Utilize a nova linha como um delimitador entre chave e valor. Isso permite uma an찼lise segura do que for gerado sem se confundir, por exemplo, atrav챕s de valores que tenham quebras de linha."
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr "Gere apenas os nomes das vari찼veis de configura챌찾o para `--list` ou `--get-regexp`."
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr "Aumente a gera챌찾o de todas as op챌천es de configura챌찾o consultadas com o tipo da origem (arquivo, entrada padr찾o, blob, linha de comando) e a origem real (o caminho do arquivo de configura챌찾o, da \"ref\" ou a ID da bolha, caso seja aplic찼vel)."
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr "Semelhante a op챌찾o `--show-origin`, na medida em que aumenta a sa챠da de todas as op챌천es de configura챌찾o consultadas com o escopo deste valor (`local`, `global`, `system`, `command`)."
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr "--get-colorbool nome [stdout-is-tty]"
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr "Encontre a configura챌찾o das cores para `nome` (por exemplo, `color.diff`) e gere 'true' ou 'false'.  O `stdout-is-tty` deve ser 'true' ou 'false' e 챕 levado em considera챌찾o quando a configura챌찾o diz \"auto\".  Caso `stdout-is-tty` esteja ausente, verifique a sa챠da padr찾o do pr처prio comando e encerre com a condi챌찾o '0' caso a cor deva ser utilizada, ou caso contr찼rio, encerre com a condi챌찾o '1'.  Quando a configura챌찾o das cores para `nome` for indefinida, o comando retroage e em vez disso usa `color.ui`."
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr "--get-color nome [default]"
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr "Localize a cor configurada para `nome` (`color.diff.new` por exemplo) e gere a sequ챗ncia no padr찾o ANSI de cor.  Em vez disso o par창metro opcional `default` 챕 utilizado, caso n찾o haja uma cor configurada para `nome`."
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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=color [--default=<default>]` 챕 prefer챠vel em vez de `--get-color` (por챕m repare que a op챌찾o `--get-color` omitir찼 a nova linha impressa por `--type=color`)."
 
 #. type: Plain text
-#: en/git-config.txt:265
+#: en/git-config.txt:272
 #, priority:100
 msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
 msgstr "Abre um editor para alterar o arquivo de configura챌찾o informado; ou `--system`,` --global` ou reposit처rio (predefinido)."
 
 #. type: Labeled list
-#: en/git-config.txt:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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 "Respeite as diretivas `include.*` nos arquivos de configura챌찾o ao procurar pelos valores. A predefini챌찾o retorna para `off` quando determinado arquivo seja informado (por exemplo, usando os comandos `--file`, `--global`, etc) e ao pesquisar por todos os arquivos de configura챌찾o."
 
 #. type: Labeled list
-#: en/git-config.txt:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr "--default <valor>"
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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 "Ao usar `--get` e a vari찼vel solicitada n찾o for encontrada, comportar-se como se o <valor> fosse o valor atribu챠do 횪 vari찼vel."
 
 #. type: Plain text
-#: en/git-config.txt:281
+#: en/git-config.txt:288
 #, 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 "O `pager.config` somente 챕 respeitado durante a listagem da configura챌찾o, ou seja, ao utilizar a op챌찾o `--list` ou qualquer um dos `--get-*` que podem retornar diversos resultados.  A predefini챌찾o 챕 utilizar um pager."
 
 #. type: Plain text
-#: en/git-config.txt:288
+#: en/git-config.txt:295
 #, priority:100
 msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
 msgstr "Caso n찾o seja definido de forma explicita com a op챌찾o `--file`, existem quatro arquivos onde o 'git config' ir찼 procurar as op챌천es de configura챌찾o:"
 
 #. type: Labeled list
-#: en/git-config.txt:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr "$(prefixo)/etc/gitconfig"
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr "Arquivo de configura챌찾o do sistema."
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr "$XDG_CONFIG_HOME/git/config"
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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 "Segundo arquivo de configura챌찾o espec챠fico do usu찼rio. Caso $XDG_CONFIG_HOME n찾o esteja definido ou esteja vazio , a op챌찾o de configura챌찾o `$HOME/.config/git/config` ser찼 utilizada. Qualquer vari찼vel com valor 첬nico definido neste arquivo ser찼 substitu챠da pelo que estiver em `~/.gitconfig`.  횋 uma boa ideia n찾o criar este arquivo no caso de voc챗 횪s vezes usar vers천es mais antigas do Git, pois o suporte para este arquivo foi adicionado recentemente."
 
 #. type: Labeled list
-#: en/git-config.txt:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr "~/.gitconfig"
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr "Arquivo de configura챌찾o espec챠fico do usu찼rio. Tamb챕m chamado de arquivo de configura챌찾o \"global\"."
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr "$GIT_DIR/config"
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr "Arquivo de configura챌찾o espec챠fico do reposit처rio."
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr "$GIT_DIR/config.worktree"
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, priority:100
 msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
 msgstr "Isso 챕 opcional e s처 챕 pesquisado quando o arquivo `extensions.worktreeConfig` est찼 presente em $GIT_DIR/config."
 
 #. type: Plain text
-#: en/git-config.txt:316
+#: en/git-config.txt:323
 #, 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 "Caso nenhuma outra op챌찾o seja utilizada, todas as op챌천es de leitura ir찾o ler todos estes arquivos que estiverem dispon챠veis. Caso o arquivo global ou o arquivo de configura챌찾o global inteiro n찾o esteja dispon챠vel, eles ser찾o ignorados. Caso o arquivo de configura챌찾o do reposit처rio n찾o estiver dispon챠vel ou leg챠vel, o comando 'git config' encerrar찼 com um c처digo de erro diferente de zero. No entanto, em nenhum dos casos ser찼 emitida uma mensagem de erro."
 
 #. type: Plain text
-#: en/git-config.txt:320
+#: en/git-config.txt:327
 #, 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 "Os arquivos s찾o lidos na ordem dada acima, com o 첬ltimo valor encontrado tendo preced챗ncia sobre os valores lidos anteriormente.  Quando v찼rios valores s찾o obtidos, ent찾o todos os valores de uma chave de todos os arquivos, ser찾o usados."
 
 #. type: Plain text
-#: en/git-config.txt:323
+#: en/git-config.txt:330
 #, 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 "Voc챗 pode substituir os par창metros da configura챌찾o dos par창metros individuais ao executar qualquer comando git utilizando a op챌찾o `-c`. Para mais detalhes, consulte linkgit:git[1]."
 
 #. type: Plain text
-#: en/git-config.txt:327
+#: en/git-config.txt:334
 #, 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 "횋 predefinido que todas as op챌천es de grava챌찾o sejam gravadas no arquivo de configura챌찾o espec챠fico do reposit처rio. Observe que isso tamb챕m afeta op챌천es como `--replace-all` e `--sunset`. *O comando 'git config' sempre ir찼 alterar um arquivo por vez*."
 
 #. type: Plain text
-#: en/git-config.txt:333
+#: en/git-config.txt:338
 #, 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 "Estas regras podem ser substitu챠das atrav챕s da linha de comando ou atrav챕s das vari찼veis de ambiente. As op챌천es `--global`, `--system` e `--worktree` limitar찾o o arquivo utilizado ao arquivo global, em todo o sistema ou por 찼rvore de trabalho, respectivamente.  A vari찼vel de ambiente `GIT_CONFIG` environment variable has a similar effecttem um efeito similar, por챕m 챕 poss챠vel definir um nome do arquivo caso queira."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
+msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr "VARI횁VEIS DO AMBIENTE"
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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 "Pegue a configura챌찾o do arquivo informado em vez de .git/config. Usar a op챌찾o \"--global\" for챌a isso para ~/.gitconfig. Usar a op챌찾o \"--system\" for챌a isso para $(prefixo)/etc/gitconfig."
-
 #. type: Labeled list
 #: en/git-config.txt:343
 #, ignore-same, no-wrap, priority:100
@@ -16965,14 +17024,26 @@ msgstr "Caso GIT_CONFIG_COUNT seja definido como um n첬mero positivo, todos os p
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr "횋 첬til para os casos onde voc챗 queira gerar v찼rios comandos git com uma configura챌찾o comum, por챕m n찾o pode depender de um arquivo de configura챌찾o, ao escrever scripts por exemplo."
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr "Dado um .git/config como este:"
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16988,7 +17059,7 @@ msgstr ""
 "#\n"
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -17002,7 +17073,7 @@ msgstr ""
 "\tfilemode = false\n"
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -17016,7 +17087,7 @@ msgstr ""
 "\trenames = true\n"
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -17030,7 +17101,7 @@ msgstr ""
 "\tgitproxy=default-proxy ; for all the rest\n"
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -17048,157 +17119,157 @@ msgstr ""
 "\tcookieFile = /tmp/cookie.txt\n"
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr "voc챗 pode definir o `filemode` como 'true' com"
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, 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:416
+#: en/git-config.txt:422
 #, 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 "As hipot챕ticas entradas de comando do proxy realmente t챗m um postfix para discernir a qual URL elas se aplicam. Aqui um exemplo de como alterar a entrada do kernel.org para \"ssh\"."
 
 #. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, priority:100
 msgid "This makes sure that only the key/value pair for kernel.org is replaced."
 msgstr "Isso garante que apenas o par de chave/valor do kernel.org seja substitu챠do."
 
 #. type: Plain text
-#: en/git-config.txt:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr "Para excluir a entrada para renomear, fa챌a"
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, 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:431
+#: en/git-config.txt:437
 #, 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 "Caso queira excluir uma entrada para um \"multivar\" (como `core.gitproxy` acima), 챕 necess찼rio fornecer um `regex` que coincida com o valor exato de uma linha."
 
 #. type: Plain text
-#: en/git-config.txt:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr "Para consultar o valor para uma determinada chave, fa챌a"
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, 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:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr "ou"
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr "% git config core.filemode\n"
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr "ou, para consultar um `multivar`:"
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, 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:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr "Caso queira conhecer todos os valores de um `multivar`, fa챌a:"
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, 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:458
+#: en/git-config.txt:464
 #, priority:100
 msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
 msgstr "Caso queira viver perigosamente, 챕 poss챠vel substituir *all* `core.gitproxy` por um novo com"
 
 #. type: delimited block -
-#: en/git-config.txt:461
+#: en/git-config.txt:467
 #, 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:465
+#: en/git-config.txt:471
 #, 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 "No entanto, caso queira realmente substituir apenas a linha pelo proxy predefinido, ou seja, aquele sem um \"for ...\" `postfix`, fa챌a algo assim:"
 
 #. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:474
 #, 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:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr "Para que haja a real coincid챗ncia apenas com os valores de um ponto de exclama챌찾o, 챕 necess찼rio"
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, 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:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr "Para adicionar um novo proxy, sem alterar qualquer outro j찼 existente, utilize"
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr "Um exemplo para usar cores personalizadas da configura챌찾o em seu script:"
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -17212,13 +17283,13 @@ msgstr ""
 "echo \"${WS}your whitespace color or blue reverse${RESET}\"\n"
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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 "Para URLSs em `https://weak.example.com`, `http.sslVerify` est찼 definido como `false`, enquanto est찼 definido para `true` para todos os outros:"
 
 #. type: delimited block -
-#: en/git-config.txt:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -17238,19 +17309,19 @@ msgstr ""
 "http.sslverify false\n"
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr "BUGS"
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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 "Ao utilizar a sintaxe j찼 obsoleta `[section.subsection]`, alterando um valor, resultar찼 na adi챌찾o de uma chave com v찼rias linhas em vez de uma altera챌찾o apenas, caso a subse챌찾o seja informada com pelo menos um caractere em mai첬sculo. Por exemplo, quando a configura챌찾o se parece"
 
 #. type: delimited block -
-#: en/git-config.txt:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -17260,13 +17331,13 @@ msgstr ""
 "    key = value1\n"
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr "e executando `git config section.Subsection.key value2` resultar찼 em"
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -20000,103 +20071,104 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr "Em vez de encontrar a tag que anteceda um commit, localize a tag que vem ap처s o commit e a contenha.  Implica automaticamente no uso da op챌찾o `--tags`."
 
 #. type: Plain text
-#: en/git-describe.txt:70
-#, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+#: en/git-describe.txt:71
+#, fuzzy, priority:260
+#| msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr "Em vez de usar os 7 d챠gitos hexadecimais predefinidos como o nome abreviado do objeto, utilize `<n>` d챠gitos ou quantos d챠gitos forem necess찼rios para formar um nome do objeto que seja 첬nico.  Um `<n>` que seja 0, suprime o formato longo exibindo apenas a tag mais pr처xima."
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr "--candidates=<n>"
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr "Em vez de considerar apenas as 10 tags mais recentes como candidatas para descrever o commit de entrada, considere at챕 `<n>` candidatos.  Aumentando `<n>` para acima de 10 haver찼 um consumo um pouco maior de tempo, no entanto, poder찼 produzir um resultado mais preciso.  Um `<n>` que seja 0 far찼 com que apenas as coincid챗ncias exatas sejam exibidas."
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr "Apenas os resultados exatos de sa챠da (uma tag faz refer챗ncia direta ao commit informado).  Este 챕 um sin척nimo para `--candidates=0`."
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr "Exibe de forma detalhada as informa챌천es sobre a estrat챕gia de pesquisa que est찼 sendo empregada para o erro predefinido. predefinida.  O nome da tag ainda ser찼 impresso para a sa챠da."
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 "Sempre imprima o formato longo (a tag, o a quantidade de commits e o nome abreviado do commit), mesmo quando coincidir com uma tag.  Isso 챕 첬til quando voc챗 deseja ver as partes do nome do objeto commit na sa챠da \"describe\", mesmo quando a confirma챌찾o em quest찾o seja uma vers찾o marcada.  Em vez de apenas emitir o nome da tag, ele descrever찼 um commit como `v1.2-0-gdeadbee` (0쨘 commit desde a tag `v1.2` que aponta para o objeto `deadbee`....)."
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr "--match <padr찾o>"
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr "Considere apenas as tags que coincidam ao padr찾o `glob (7)`, excluindo o prefixo \"refs/tags/\". Se utilizado com `--all`, tamb챕m considera as ramifica챌천es locais e as refer챗ncias do monitoramento remoto que coincidam com o padr찾o, excluindo respectivamente o prefixo \"refs/heads/\" e \"refs/remotes/\"; as refer챗ncias dos outros tipos nunca s찾o consideradas. Caso seja utilizado v찼rias vezes, uma lista de padr천es ser찼 acumulada e as tags que coincidam com qualquer um dos padr천es ser찾o consideradas.  Utilize `--no-match` para limpar e redefinir a lista dos padr천es."
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr "--exclude <padr찾o>"
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr "N찾o considere as tags que coincidam com padr찾o `glob (7)`, excluindo o prefixo \"refs/tags/\". Se utilizado com `--all`, tamb챕m n찾o considera as ramifica챌천es locais e as refer챗ncias do rastreamento remoto coincidentes ao padr찾o, excluindo respectivamente o prefixo \"refs/heads/\" e \"refs/remotes/\"; as refer챗ncias de outros tipos nunca s찾o consideradas. Caso seja utilizado v찼rias vezes, uma lista de padr천es ser찼 acumulada e as tags que coincidam a qualquer um dos padr천es ser찾o exclu챠das. Quando combinada com `--match`, uma tag ser찼 considerada quando coincidir a pelo menos um padr찾o `--match` e n찾o corresponder a nenhum dos padr천es `--exclude`. Utilize `--no-exclude` para limpar e redefinir a lista dos padr천es."
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr "Exiba o objeto commit abreviado exclusivamente como \"fallback\" (retirada)."
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr "Siga apenas o primeiro commit da origem ao ver um commit de mesclagem.  Isso 챕 첬til quando voc챗 quer que as tags n찾o coincidam nos ramos mesclados do hist처rico do commit de destino."
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr "Algo como a 찼rvore atual do `git.git`, recebo:"
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -20106,25 +20178,26 @@ msgstr ""
 "\tv1.0.4-14-g2414721\n"
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr "ou seja, o cabe챌alho atual do meu ramo \"original\" tem base na vers찾o `v1.0.4`, mas como ele tem alguns commits a mais, o description adicionou a quantidade de commits adicionais (\"14\") e um nome do objeto abreviado para o pr처prio commit (\"2414721\") no final."
 
 #. 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\" + 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."
+#: en/git-describe.txt:151
+#, fuzzy, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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 "A quantidade de commits adicionais 챕 a quantidade de commits que seriam exibidas com \"git log v1.0.4..parent\".  O sufixo hash 챕 \"-g\" + abrevia챌찾o inequ챠voca para o commit como uma dica da origem (que era `2414721b194453f058079d897d13c4e377f92dc6`).  O prefixo \"g\" significa \"git\" e 챕 utilizado para permitir a descri챌찾o da vers찾o de um software, dependendo do SCM com o qual o software 챕 gerenciado. Isso 챕 첬til em um ambiente onde as pessoas podem usar diferentes SCMs."
 
 #. type: Plain text
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr "Ao executar o comando 'git description' no nome de uma tag exibir찼 apenas o seu nome:"
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -20134,13 +20207,13 @@ msgstr ""
 "\tv1.0.4\n"
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr "Com a op챌찾o `--all`, o comando pode utilizar os `heads` (cabe챌alhos) do ramo como refer챗ncia, portanto a sa챠da exibe tamb챕m o caminho de refer챗ncia:"
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -20150,7 +20223,7 @@ msgstr ""
 "\ttags/v1.0.0-21-g975b\n"
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -20160,13 +20233,13 @@ msgstr ""
 "\theads/lt/describe-7-g975b\n"
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr "Com a op챌찾o `--abbrev` definido como 0, o comando pode ser utilizado para encontrar o nome da tag mais pr처ximo sem nenhum sufixo:"
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -20176,37 +20249,37 @@ msgstr ""
 "\ttags/v1.0.0\n"
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr "Observe que o sufixo que voc챗 recebe caso digite estes comandos hoje, pode ser que ele pare챌a ser mais longo do que foi antes quando Linus executou estes mesmos comandos, pois o seu reposit처rio Git pode ter novos commits cujos nomes do objeto saem com 975b que n찾o existiam naquela 챕poca, e o sufixo \"-g975b\" sozinho pode n찾o ser suficiente para desambiguar estes commits."
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr "ESTRAT횋GIA DE PESQUISA"
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr "Para cada 'commit-ish' informado, o comando 'git description' procurar찼 primeiro em uma tag que identifique exatamente este commit.  As tags anotadas sempre ser찾o preferidas 횪s tags leves, as tags com datas mais recentes sempre ser찾o preferidas 횪s tags com datas mais antigas.  Em caso de uma coincid챗ncia exata ser encontrada, o seu nome ser찼 exibido e a pesquisa ser찼 interrompida."
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr "Caso uma coincid챗ncia exata n찾o seja encontrada, o comando 'git description' retornar찼 ao hist처rico do commit para encontrar um commit ancestral que tenha sido marcado.  A tag do ancestral ser찼 gerada juntamente com uma abrevia챌찾o do SHA-1 do 'commit-ish' da entrada. Caso `--first-parent` teha sido utilizado, ser찼 considerada apenas o primeiro pai de cada commit."
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr "No caso v찼rias tags serem localizadas durante o procedimento, ser찼 selecionada e gerada a tag que possuir a menor quantidade de \"commit-ish\" diferentes na entrada.  Aqui, a menor quantidade de commits diferentes 챕 definido pela quantidade de commits que seriam exibidos atrav챕s do comando `git log tag..input`, o seu resultado ser찼 a menor quantidade de commits poss챠veis."
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr "Os objetos 찼rvore assim como os objetos tag que n찾o apontem para um commit n찾o podem ser descritos.  Ao descrever as bolhas, as tags mais leves que apontam para as bolhas s찾o ignoradas, por챕m a bolha ainda 챕 descrita como <committ-ish>:<caminho> apesar da tag mais leve ser favor찼vel."
@@ -20236,19 +20309,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr "Compara os arquivos na 찼rvore de trabalho e no 챠ndice.  Quando os caminhos s찾o utilizados, compara apenas os caminhos informados.  Caso contr찼rio, todas as entradas no 챠ndice ser찾o comparadas.  O formato de sa챠da 챕 o mesmo que para `git diff-index` e `git diff-tree`."
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr "-1 --base"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr "-2 --ours"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr "-3 --theirs"
@@ -20848,7 +20921,7 @@ msgid "The id of a tree object."
 msgstr "A identifica챌찾o de um objeto 찼rvore."
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr "<caminho>..."
@@ -21035,15 +21108,17 @@ msgstr "Este formul찼rio serve para exibir as altera챌천es feitas em rela챌찾o a
 
 #. type: Plain text
 #: en/git-diff.txt:56
-#, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+#, fuzzy, priority:280
+#| msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr "Caso a op챌찾o --merge-base seja usada, em vez de usar <commit>, use a base mesclada do <commit> e HEAD.  `git diff --merge-base A` 챕 o mesmo que `git diff $(git merge-base A HEAD)`."
 
 #. type: Labeled list
 #: en/git-diff.txt:57
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
-msgstr "'git diff' [<op챌천es>] <commit> [--] [<caminho>...]"
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
+msgstr "'git diff' [<op챌천es>] [--merge-base] <commit> <commit> [--] [<caminho>...]"
 
 #. type: Plain text
 #: en/git-diff.txt:64
@@ -21051,110 +21126,116 @@ msgstr "'git diff' [<op챌천es>] <commit> [--] [<caminho>...]"
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr "Este formul찼rio exibe as modifica챌천es feitas por voc챗 na sua 찼rvore de trabalho relativo ao nome do `<commit>`.  횋 poss챠vel utilizar o `HEAD` para compar찼-lo com o commit mais recente ou para comparar com o cume de um ramo diferente."
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr "Caso a op챌찾o --merge-base seja usada, em vez de usar <commit>, use a base mesclada do <commit> e HEAD.  `git diff --merge-base A` 챕 o mesmo que `git diff $(git merge-base A HEAD)`."
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr "'git diff' [<op챌천es>] [--merge-base] <commit> <commit> [--] [<caminho>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr "Isso 챕 para exibir as altera챌천es entre os dois `<commits>` arbitr찼rios."
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr "Caso a op챌찾o --merge-base seja usada, use a base mesclada dos dois commits do lado \"anterior\". O comando `git diff --merge-base A B` 챕 o mesmo que `git diff $(git merge-base A B) B`."
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr "'git diff' [<op챌천es>] <commit> <commit>... <commit> [--] [<caminho>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr "Este formul찼rio serve para visualizar os resultados da mesclagem de um commit.  Os primeiros <commit> que forem listados devem ser a mesclagem em si; os dois ou mais commits restantes devem ser seus pais.  Uma maneira conveniente de produzir o conjunto desejado das revis천es 챕 usar o sufixo `^@`.  Como por exemplo, caso o  'master' nomeie a mesclagem de um commit, o comando `git diff master^@` retorna o mesmo diff combinado como no comando `git show master`."
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "'git diff' [<op챌천es>] <commit>..<commit> [--] [<caminho>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr "Isso 챕 um sin척nimo do formul찼rio anterior (sem o `..`) para visualizar as altera챌천es entre dois <commit> arbitr찼rios.  Caso o <commitir> de um lado seja omitido, ele ter찼 o mesmo efeito que usar `HEAD`."
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "'git diff' [<op챌천es>] <commit>\\...<commit> [--] [<caminho>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 "Este formul찼rio 챕 para exibir as altera챌천es no ramo que contenha at챕 o segundo `<commit>`, iniciando com um ancestral comum de ambos os `<commit>`.  `git diff A...B` 챕 o equivalente a um `git diff $(git merge-base A B) B`.  Voc챗 pode omitir qualquer um dos `<commit>` que tem o mesmo efeito que usar `HEAD`."
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr "No caso de voc챗 estar fazendo algo ex처tico, deve-se notar que todos os `<commit>` na descri챌찾o acima, exceto no caso da op챌찾o `--merge-base` nas duas 첬ltimas formas que usam as nota챌천es `..`, podem ser qualquer `<찼rvore>`."
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 "Para obter uma lista mais completa de maneiras de soletrar um `<commit>`, consulte a se챌찾o \"DEFININDO AS REVIS횛ES\" em linkgit:gitrevisions[7].  No entanto, `diff` 챕 sobre comparar dois _endpoints_, e n찾o os intervalos, as nota챌천es de intervalo (`<commit>.. <commit>` e `<commit>... <commit>`) n찾o significam um intervalo definido na se챌찾o \"DEFININDO AS REVIS횛ES\" em linkgit:gitrevisions[7]."
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr "'git diff' [<op챌천es>] <blob> <blob>"
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr "Este formul찼rio serve para exibir as altera챌천es feitas entre o conte첬do bruto de dois objetos bolha."
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr "Compare a 찼rvore de trabalho com a vers찾o \"base\" (stage #1), \"o nosso ramo\" (stage #2) \"o ramo deles\" (stage #3).  O 챠ndice cont챕m estas etapas apenas para as entradas que n찾o foram n찾o mescladas enquanto estiver resolvendo os conflitos.  Para obter informa챌천es mais detalhadas, consulte a se챌찾o \"3-Way Merge\" linkgit:git-read-tree[1]."
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr "Omita a sa챠da diff para as entradas que n찾o tenham sido mescladas e exiba \"Unmergedd\".  S처 pode ser utilizado quando comparamos a 찼rvore de trabalho com o 챠ndice."
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr "Os par창metros `<paths>`, quando utilizados, s찾o para limitar o `diff` quanto aos nomes dos caminhos (voc챗 pode dar nomes de diret처rios e obter um `diff` para todos os arquivos sob eles)."
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr "V찼rias maneiras para verificar a sua 찼rvore de trabalho"
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -21166,31 +21247,31 @@ msgstr ""
 "$ git diff HEAD       <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr "As mudan챌as na 찼rvore de trabalho ainda n찾o preparadas para o pr처ximo commit."
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr "As altera챌천es entre o 챠ndice e o seu 첬ltimo commit; o que voc챗 estaria fazendo no commit caso voc챗 executasse o comando `git commit` sem a op챌찾o `-a`."
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr "As altera챌천es na 찼rvore de trabalho desde o seu 첬ltimo commit; o que voc챗 estaria fazendo no commit caso executasse o comando `git commit -a`"
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr "Comparando com commits arbitr찼rios"
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -21202,31 +21283,31 @@ msgstr ""
 "$ git diff HEAD^ HEAD      <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr "Em vez de utilizar o cume do ramo atual, compare com o cume do ramo \"teste\"."
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr "Em vez de comparar com o cume do ramo \"teste\", compare com o cume do ramo atual, limitando-se a compara챌찾o com o arquivo \"teste\"."
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr "Compare a vers찾o antes do 첬ltimo commit e o 첬ltimo commit."
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr "Comparando os ramos"
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -21238,31 +21319,31 @@ msgstr ""
 "$ git diff topic...master  <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr "As altera챌천es entre as dicas do t처pico e as ramifica챌천es principais."
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr "O mesmo que acima."
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr "As altera챌천es que ocorreram na ramifica챌찾o master (mestre) desde quando a ramifica챌찾o do t처pico foi iniciada."
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr "Limitando a sa챠da diff"
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -21274,31 +21355,31 @@ msgstr ""
 "$ git diff arch/i386 include/asm-i386   <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr "Exibe apenas as modifica챌천es, renomea챌천es e c처pias, mas n찾o a adi챌찾o ou exclus찾o."
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr "Exibe apenas os nomes e a natureza da altera챌찾o, mas n찾o a sa챠da diff real."
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr "Limite a sa챠da diff aos nomes das sub찼rvores."
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr "Arruinando a sa챠da diff"
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -21308,19 +21389,19 @@ msgstr ""
 "$ git diff -R                          <2>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr "Gaste alguns ciclos extras para encontrar renomea챌천es, c처pias e reescritas completas (muito custoso ao sistema)."
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr "Sa챠da do diff em reverso."
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, 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], linkgit:git-show[1]"
 msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -28868,7 +28949,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr "Imprima apenas as partes que coincidam (n찾o vazias) de uma linha coincidente com cada uma dessas partes em uma linha separada na sa챠da."
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -32310,7 +32391,20 @@ msgid ""
 ">\n"
 "> EOF\n"
 "subject\n"
-msgstr "$ cat ~/bin/glog-find-author\n#!/bin/sh\ntest -n \"$1\" && git log --author=\"$1\" --pretty=\"%an <%ae>\" -1 || true\n$ git config trailer.help.key \"Auxiliado por: \"\n$ git config trailer.help.ifExists \"addIfDifferentNeighbor\"\n$ git config trailer.help.cmd \"~/bin/glog-find-author\"\n$ git interpret-trailers --trailer=\"help:Junio\" --trailer=\"help:Couder\" <<EOF\n> assunto\n>\n> mensagem\n>\n> EOF\nassunto\n"
+msgstr ""
+"$ cat ~/bin/glog-find-author\n"
+"#!/bin/sh\n"
+"test -n \"$1\" && git log --author=\"$1\" --pretty=\"%an <%ae>\" -1 || true\n"
+"$ git config trailer.help.key \"Auxiliado por: \"\n"
+"$ git config trailer.help.ifExists \"addIfDifferentNeighbor\"\n"
+"$ git config trailer.help.cmd \"~/bin/glog-find-author\"\n"
+"$ git interpret-trailers --trailer=\"help:Junio\" --trailer=\"help:Couder\" <<EOF\n"
+"> assunto\n"
+">\n"
+"> mensagem\n"
+">\n"
+"> EOF\n"
+"assunto\n"
 
 #. type: delimited block -
 #: en/git-interpret-trailers.txt:372
@@ -32318,7 +32412,9 @@ msgstr "$ cat ~/bin/glog-find-author\n#!/bin/sh\ntest -n \"$1\" && git log --aut
 msgid ""
 "Helped-by: Junio C Hamano <gitster@pobox.com>\n"
 "Helped-by: Christian Couder <christian.couder@gmail.com>\n"
-msgstr "Auxiliado por: Junio C Hamano <gitster@pobox.com>\nAuxiliado por: Christian Couder <christian.couder@gmail.com>\n"
+msgstr ""
+"Auxiliado por: Junio C Hamano <gitster@pobox.com>\n"
+"Auxiliado por: Christian Couder <christian.couder@gmail.com>\n"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:377
@@ -32343,7 +32439,20 @@ msgid ""
 ">\n"
 "> EOF\n"
 "subject\n"
-msgstr "$ cat ~/bin/glog-grep\n#!/bin/sh\ntest -n \"$1\" && git log --grep \"$1\" --pretty=reference -1 || true\n$ git config trailer.ref.key \"Refer챗ncia para: \"\n$ git config trailer.ref.ifExists \"substitua\"\n$ git config trailer.ref.cmd \"~/bin/glog-grep\"\n$ git interpret-trailers --trailer=\"ref:Add copyright notices.\" <<EOF\n> assunto\n>\n> mensagem\n>\n> EOF\nassunto\n"
+msgstr ""
+"$ cat ~/bin/glog-grep\n"
+"#!/bin/sh\n"
+"test -n \"$1\" && git log --grep \"$1\" --pretty=reference -1 || true\n"
+"$ git config trailer.ref.key \"Refer챗ncia para: \"\n"
+"$ git config trailer.ref.ifExists \"substitua\"\n"
+"$ git config trailer.ref.cmd \"~/bin/glog-grep\"\n"
+"$ git interpret-trailers --trailer=\"ref:Add copyright notices.\" <<EOF\n"
+"> assunto\n"
+">\n"
+"> mensagem\n"
+">\n"
+"> EOF\n"
+"assunto\n"
 
 #. type: delimited block -
 #: en/git-interpret-trailers.txt:396
@@ -32500,373 +32609,374 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr "--decorate[=short|full|auto|no]"
 
 #. type: Plain text
-#: en/git-log.txt:43
-#, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+#: en/git-log.txt:45
+#, fuzzy, priority:260
+#| msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr "Imprima os nomes das refs de quaisquer commits que est찾o sendo exibidos. Caso `short` seja definido, os prefixos do nome das refs `refs/heads/`, `refs/tags/` e `refs/remotes/` n찾o ser찾o impressos. Caso `full` seja definido, o nome completo da \"ref\" (incluindo o prefixo) ser찼 impresso. Caso 'auto' seja definido, caso a sa챠da seja para um terminal, os nomes das refer챗ncias ser찾o exibidas como se 'short' tenha sido utilizado, caso contr찼rio, nenhum nome da refer챗ncia ser찼 exibido. A op챌찾o predefinida 챕 'short'."
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr "--decorate-refs=<padr찾o>"
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr "--decorate-refs-exclude=<padr찾o>"
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr "caso nenhuma op챌찾o `--decorate-refs` seja utilizada, finja que todos as refs foram inclu챠das.  Para cada candidato, n찾o o use para decora챌찾o caso ele coincida com algum padr찾o fornecido para a op챌찾o `--decorate-refs-exclude` ou caso n찾o coincida com nenhum padr찾o fornecido para `--decorate-refs`. A op챌찾o de configura챌찾o `log.excludeDecoration` permite excluir as refs das decora챌천es, por챕m um padr찾o expl챠cito `--decorate-refs` ser찼 substituida caso coincida com `log.excludeDecoration`."
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr "Exiba na tela o nome \"ref\" utilizado na linha de comando pela qual cada commit foi alcan챌ado."
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr "Utilize o arquivo mailmap para mapear os nomes dos autores dos commits e seus endere챌os de e-mail para nomes e endere챌os de e-mail reais can척nicos. Consulte linkgit:git-shortlog[1]."
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 "Sem esta op챌찾o, o comando `git log -p <caminho> ...` exibe os commits que tocam os caminhos informados e os \"diffs\" sobre os mesmos caminhos.  Com isso, o \"diff\" completo 챕 exibido para os commits que tocam nos caminhos informados; significa que o \"<caminho> ...\" limita apenas os commits, n찾o limita o \"diff\" para estes commits."
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr "Observe que isso afeta todos os tipos de sa챠da baseados em \"diff\", por exemplo os produzidos pelas op챌천es `--stat`, etc."
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr "Inclua uma linha ``log size <n첬mero>'' na sa챠da para cada commit, onde o <n첬mero> 챕 o comprimento da mensagem deste commit em bytes.  Destina-se a acelerar as ferramentas que leem as mensagens a partir do comando `git log` para alocar espa챌o antecipadamente."
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr "<intervalo da revis찾o>"
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr "Exibe apenas os commits no intervalo definido das revis천es.  Quando um <intervalo de revis찾o> n찾o 챕 definido, a predefini챌찾o retorna para `HEAD` (ou seja, todo o hist처rico que leva ao commit atual).  O `origin..HEAD` define todos os commits acess챠veis a partir do commit atual (ou seja, `HEAD`), por챕m n찾o a partir do `origin`. Para obter uma lista mais completa de maneiras de soletrar os nomes dos objetos, consulte a se챌찾o \"DEFININDO OS INTERVALOS\" no linkgit:gitrevisions[7]."
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr "[--] <caminho>..."
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr "Exiba apenas os commits que sejam suficientes para explicar como os arquivos que coincidam com os caminhos informados foram criados.  Consulte 'Simplifica챌찾o do Hist처rico' abaixo para obter mais detalhes e para conhecer os outros modos de simplifica챌찾o."
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr "Os caminhos podem precisar ser prefixados com um `--` para separ찼-los das op챌천es ou do intervalo de revis천es, quando um conflito surgir."
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr "FORMATA횉횄O DIFF"
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr "Por predefini챌찾o, o comando `git log` n찾o gera qualquer diff. As op챌천es abaixo podem ser usadas para exibir as altera챌천es feitas por cada commit."
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr "Note que a menos que uma das variantes `--diff-merges` (incluindo as op챌천es curtas`-m`, `-c` e `--cc`) seja explicitamente informada, a mesclagem dos commits n찾o mostrar찾o um diff, mesmo se um diff formato como `--patch` seja escolhido, nem corresponder찼 횪s op챌천es de pesquisa como `-S`. A exce챌찾o 챕 quando a op챌찾o `--first-parent` est찼 em uso, neste caso`first-parent` 챕 o formato predefinido."
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr "`git log --no-merges`"
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr "Exibe todo o hist처rico do commit, mas ignore todas as mesclagens"
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr "`git log v2.6.12.. include/scsi drivers/scsi`"
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr "Exibe todos os commits desde a vers찾o 'v2.6.12' que alterou qualquer arquivo nos subdiret처rios 'include/scsi' ou 'drivers/scsi'"
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr "`git log --since=\"2 weeks ago\" -- gitk`"
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr "Exibe as altera챌천es nas 첬ltimas duas semanas no arquivo 'gitk'.  O `--` 챕 necess찼rio para evitar confus찾o com o *ramo* chamado 'gitk'"
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr "`git log --name-status release..test`"
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr "Exibe os commits que est찾o no ramo \"test\", mas n찾o ainda no ramo \"release\", junto com a lista dos caminhos que cada commit modifica."
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr "`git log --follow builtin/rev-list.c`"
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr "Exibe os commits que mudaram o arquivo `builtin/rev-list.c`, incluindo os commits que ocorreram antes do arquivo receber o nome atual."
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr "`git log --branches --not --remotes=origin`"
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr "Exibe todas os commits que est찾o em qualquer uma das ramifica챌천es locais, mas n찾o em quaisquer outras ramifica챌천es remotas rastreadas para 'origin' (o que voc챗 tem mas na \"origin\" n찾o)."
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr "`git log master --not --remotes=*/master`"
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr "Exibe todos os commits que est찾o no \"master\" local, mas n찾o em nenhuma outra ramifica챌찾o \"master\" do reposit처rio remoto."
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr "`git log -p -m --first-parent`"
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr "EWxibe o hist처rico, incluindo as altera챌천es dos diffs, por챕m apenas da perspectiva do ``ramo principal'', ignorando os commits provenientes da mesclagem das ramifica챌천es e exibindo os diffs completos das altera챌천es introduzidas pelas mesclagens.  Apenas faz sentido ao seguir uma pol챠tica estrita de mesclar todos os t처picos das ramifica챌천es ao permanecer em um 첬nico ramo integrado."
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr "`git log -L '/int main/',/^}/:main.c`"
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr "Exibe como a fun챌찾o `main()` no arquivo `main.c` evoluiu ao longo do tempo."
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr "`git log -3`"
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr "Limita a quantidade de commits a serem exibidos em 3."
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr "Para configura챌천es relacionadas com a gera챌찾o de arquivos diferenciais \"diff\" consulte linkgit:git-diff[1], para as vari찼veis principais consulte linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr "횋 a op챌찾o predefinida para `--format`.  (Consulte 'Formatos bonitos' acima.)  A predefini챌찾o retorna para `medium`."
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr "Codifica챌찾o que ser찼 utilizada para exibir os registros logs.  (Consulte a 'Discuss찾o' acima.)  A predefini챌찾o retorna para o valor existente na op챌찾o de configura챌찾o `i18n.commitEncoding` caso seja definido, caso contr찼rio, 'UTF-8'."
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr "O formato predefinido para que as datas sejam leg챠veis para as pessoas.  (Compare a op챌찾o `--date`.)  A predefini챌찾o retorna para \"default\", o que significa escrever as datas como `Sat May 8 19:35:34 2010 -0500`."
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr "Caso o formato esteja definido como \"auto:foo\" e o pager estiver em uso, o format \"foo\" ser찼 utilizado para o formato da data. Caso contr찼rio, a \"predefini챌찾o\" ser찼 usada."
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr "Caso seja `true`, o comando `git log` como se a op챌찾o `--follow` tenha sido usada quando um 첬nico <caminho> seja utilizado.  Isso tem as mesmas limita챌천es que a op챌찾o `--follow`, ou seja, n찾o pode ser usado para seguir v찼rios arquivos e n찾o funciona bem em hist처rico n찾o linear."
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr "Caso seja `false`, o comando `git log` e relacionados, n찾o tratar찾o o commit inicial como um grande epis처dio de cria챌찾o.  Qualquer commit raiz gerado pelo comando `git log -p` seria exibido sem um diff anexado.  A predefini챌찾o 챕 `true`."
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr "Caso o valor `true` seja utilizado, o `git log` e os comandos relacionados atuar찾o como se a op챌찾o `--show-signature` tivesse sido utilizada."
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr "mailmap.*"
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr "Consulte linkgit:git-shortlog[1]."
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr "notes.displayRef"
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr "Quais as refs, al챕m do padr찾o definido atrav챕s da op챌찾o de configura챌찾o `core.notesRef` ou do `GIT_NOTES_REF`, para ler as anota챌천es ao exiir as mensagens do commit com a fam챠lia de comandos `log`.  Consulte linkgit:git-notes[1]."
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr "Pode ser um nome sem abrevia챌찾o ou um \"glob\" e pode ser especificado v찼rias vezes.  Um aviso ser찼 emitido para refs que n찾o existem, mas um \"glob\" que n찾o corresponda a nenhum \"ref\" 챕 silenciosamente ignorado."
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr "Essa configura챌찾o pode ser desativada pela op챌찾o `--no-notes`, ou substitu챠da pela vari찼vel de ambiente`GIT_NOTES_DISPLAY_REF` e substitu챠da pela op챌찾o `--notes=<ref>`."
@@ -33710,7 +33820,10 @@ msgid ""
 "'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n]\n"
 "\t       [--[no-]scissors] [--quoted-cr=<action>]\n"
 "\t       <msg> <patch>\n"
-msgstr "'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n]\n\t       [--[no-]scissors] [--quoted-cr=<a챌찾o>]\n\t       <msg> <patch>\n"
+msgstr ""
+"'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n]\n"
+"\t       [--[no-]scissors] [--quoted-cr=<a챌찾o>]\n"
+"\t       <msg> <patch>\n"
 
 #. type: Plain text
 #: en/git-mailinfo.txt:25
@@ -38178,8 +38291,9 @@ msgstr "Esta op챌찾o fornece um limite adicional em cima da op챌찾o `--window`;
 
 #. type: Plain text
 #: en/git-pack-objects.txt:135
-#, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+#, fuzzy, priority:100
+#| msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr "Em cen찼rios incomuns, talvez voc챗 n찾o consiga criar arquivos maiores que um determinado tamanho no seu sistema de arquivos, esta op챌찾o pode ser utilizada para dizer ao comando para dividir o arquivo de pacotes que for gerado em v찼rios outros arquivos de pacotes menores, cada um n찾o maior que um tamanho determinado. O tamanho pode ter o sufixo \"k\", \"m\" ou \"g\". O tamanho m챠nimo permitido 챕 limitado a 1 MiB.  Esta op챌찾o impede a cria챌찾o de um 챠ndice bitmap.  A predefini챌찾o 챕 ilimitada, a menos que a vari찼vel de configura챌찾o `pack.packSizeLimit` esteja definida."
 
 #. type: Labeled list
@@ -38195,7 +38309,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr "Esta op챌찾o faz com que um objeto que j찼 esteja em um pacote local que possua um arquivo '.keep' seja ignorado, mesmo que j찼 tivesse sido compactado."
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr "--keep-pack=<nome-do-pacote>"
@@ -38399,7 +38513,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr "Omite os objetos que se sabe estar no ramo remoto.  (Esta op챌찾o tem o objetivo de operar apenas nos objetos criados localmente, para que, quando forem reempacotados, ainda mantenhamos uma distin챌찾o entre os objetos que foram criados localmente [sem .promisor] e os objetos \"promisor\" remoto [com .promisor].) Isso 챕 utilizado com clone parcial."
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -38435,7 +38549,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr "Mantenha os objetos inacess챠veis de forma solta. Implica no uso da op챌찾o `--revs`."
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -38551,7 +38665,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr "Observe que escolhemos uma 첬nica ilha para cada regex, utilizando a ordem \"last one wins\" ou \"o 첬ltimo vence\" (que permite que determinada configura챌찾o do repo tenha preced챗ncia sobre a configura챌찾o do usu찼rio e assim por diante)."
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr "As v찼rias vari찼veis de configura챌찾o afetam o empacotamento, consulte linkgit:git-config[1] (pesquise por \"pack\" e \"delta\")."
@@ -39114,8 +39228,9 @@ msgstr "Quando definido como `preserve` (j찼 descontinuado em favor de `merges`)
 
 #. type: Plain text
 #: en/git-pull.txt:121
-#, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+#, fuzzy, priority:220
+#| msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr "Quando for falso, mescle a ramifica챌찾o atual na ramifica챌찾o upstream."
 
 #. type: Plain text
@@ -39608,8 +39723,9 @@ msgstr "Esta op챌찾o substitui esta restri챌찾o caso o valor atual da \"ref\" re
 
 #. type: Plain text
 #: en/git-push.txt:249
-#, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+#, fuzzy, priority:220
+#| msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr "Imagine que voc챗 precise refazer o que j찼 foi publicado.  Voc챗 precisar찼 ignorar a regra \"deve avan챌ar rapidamente\" para substituir o hist처rico publicado originalmente atrav챕s  hist처rico que foi reformulado.  Caso algu챕m construa no topo do seu hist처rico original enquanto voc챗 est찼 fazendo um \"rebase\", o topo do ramo no ramo remoto pode avan챌ar com o commit dela e impulsionar cegamente com o `--force` far찼 com que ela perca o trabalho dela."
 
 #. type: Plain text
@@ -45055,115 +45171,116 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr "Esta op챌찾o oferece um limite adicional em cima da op챌찾o `--window`; o tamanho da janela ser찼 reduzido dinamicamente para n찾o ocupar mais do que '<n>' bytes na mem처ria.  횋 첬til nos reposit처rios com uma mistura de objetos grandes e pequenos para n찾o ficar sem mem처ria com uma janela grande, mas ainda assim pode tirar proveito da janela grande para os objetos menores.  O tamanho pode ter o sufixo \"k\", \"m\" ou \"g\".  A op챌찾o `--window-memory=0` torna o uso da mem처ria ilimitado.  A predefini챌찾o 챕 obtido da vari찼vel de configura챌찾o `pack.windowMemory`.  Observe que a utiliza챌찾o atual da mem처ria ser찼 o limite multiplicado pela quantidade de threads utilizados pelo linkgit:git-pack-objects[1]."
 
 #. type: Plain text
-#: en/git-repack.txt:125
-#, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+#: en/git-repack.txt:127
+#, fuzzy, priority:100
+#| msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr "O Tamanho m찼ximo de cada arquivo do pacote que foi gerado. O tamanho pode ter o sufixo \"k\", \"m\" ou \"g\". O tamanho m챠nimo permitido 챕 limitado a 1 MiB.  Caso seja definido, v찼rios pacotes poder찾o ser criados, o que tamb챕m previne a cria챌찾o de um 챠ndice do bitmap.  A predefini챌찾o 챕 ilimitada, a menos que a vari찼vel de configura챌찾o `pack.packSizeLimit` esteja definida."
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr "Escreva um 챠ndice bitmap de acessibilidade como parte do reempacotamento. Isso s처 faz sentido quando utilizado com `-a` ou `-A`, pois os bitmaps devem poder se referir para todos os objetos que sejam acess챠veis. Esta op챌찾o substitui a configura챌찾o da vari찼vel de ambiente `GIT_CURL_VERBOSE`.  Esta op챌찾o n찾o tem efeito caso v찼rios arquivos de pacotes sejam criados."
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr "Inclua os objetos no arquivo `.keep` durante o reempacotamento.  Observe que n처s anda n찾o exclu챠mos os pacotes `.keep` depois da finaliza챌찾o dos objetos empacotados (`pack-objects`).  Significa que podemos duplicar os objetos, por챕m isso torna a op챌찾o segura para ser utilizada quando existem impulsionamentos ou buscas simult창neos.  Esta op챌찾o geralmente 챕 첬til apenas caso esteja escrevendo bitmaps com `-b` ou `repack.writeBitmaps`, pois garante que o pacote de bitmap tenha os objetos necess찼rios."
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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 "Exclua o pacote informado do reempacotamento. Isso equivale a ter o arquivo `.keep` no pacote. O `<nome-do-pacote>` 챕 o nome do arquivo do pacote sem o diret처rio principal (por exemplo, `pack-123.pack`).  A op챌찾o pode ser utilizada v찼rias vezes para manter os v찼rios pacotes."
 
 #. type: Labeled list
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr "--unpack-unreachable=<quando>"
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr "Ao afrouxar os objetos inacess챠veis, n찾o se preocupe em afrouxar os objetos anteriores a `<quando>`. Pode ser utilizado para otimizar a grava챌찾o de quaisquer objetos que seriam removidos imediatamente atrav챕s de um comando de acompanhamento `git prune`."
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr "Quando utilizado com `-ad`, todos os objetos inacess챠veis dos pacotes existentes ser찾o anexados ao final do arquivo de pacotes em vez de serem removidos. Al챕m disso, todos os objetos soltos inacess챠veis ser찾o empacotados (e as suas contrapartes soltas removidas)."
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr "Encaminha a op챌찾o `--delta-islands` para `git-pack-objects`, consulte linkgit:git-pack-objects[1]."
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr "-g=<fator>"
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr "--geometric=<fator>"
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr "Organize a estrutura do pacote resultante de modo que cada sucessivo pacote contenha ao menos o `<fator>` vezes a quantidade de objetos como o pr처ximo maior pacote."
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr "O comando `git repack` garante isso determinando um \"corte\" dos packfiles que precisam ser reembalados em um para garantir uma progress찾o geom챕trica. Ser찼 escolhido o menor conjunto dos packfiles de forma que muitos dos maiores packfiles (pela contagem de objetos contidos naquele pacote) podem ser deixados intactos."
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr "Ao contr찼rio dos outros modos de reembalagem, o conjunto dos objetos que ser찾o embalados 챕 determinado exclusivamente pelo conjunto dos pacotes sendo \"juntados\"; em outras palavras, os pacotes determinados precisam ser combinados para restaurar uma progress찾o geom챕trica."
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr "Quando a op챌찾o `--unpacked` 챕 usada, os objetos soltos s찾o implicitamente inclu챠dos neste \"ajuntamento\", sem respeito 횪 sua acessibilidade. Isso est찼 sujeito a altera챌천es no futuro. Esta op챌찾o (que implica num modo de repack drasticamente diferente) n찾o tem garantia de funcionar com todas as outras combina챌천es de op챌천es para o comando `git repack`."
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr "횋 predefinido que o comando passe a op챌찾o `--delta-base-offset` para o comando 'git pack-objects'; isso normalmente resulta em pacotes um pouco menores, por챕m os pacotes gerados s찾o incompat챠veis com as vers천es do Git anteriores 횪 vers찾o 1.4.4. Caso precise compartilhar o seu reposit처rio com as vers천es mais antigas do Git de forma direta ou atrav챕s do protocolo http burro, ser찼 necess찼rio definir a vari찼vel de configura챌찾o `repack.UseDeltaBaseOffset` como 'false' e fazer o reempacotamento. O acesso das vers천es antigas do Git pelo protocolo nativo n찾o 챕 afetado por esta op챌찾o, pois a convers찾o 챕 realizada em tempo real, conforme seja necess찼rio."
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr "A compress찾o delta n찾o 챕 usada em objetos maiores do que a vari찼vel de configura챌찾o `core.bigFileThreshold` e nos arquivos com o atributo `delta` definido como falso."
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -46305,7 +46422,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr "Ap처s inspecionar o resultado da mesclagem, voc챗 pode achar que a altera챌찾o na outra ramifica챌찾o n찾o 챕 satisfat처ria.  Se executar o `git reset --hard ORIG_HEAD` permitir찼 que voc챗 volte para onde estava, mas descartar찼 as altera챌천es locais que voc챗 n찾o quer.  O `git reset --merge` mant챕m suas altera챌천es locais."
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr "Fluxo de trabalho interrompido"
@@ -48836,522 +48953,542 @@ msgstr "Define o envelope do remetente utilizado para enviar os e-mails.  횋 첬t
 
 #. type: Labeled list
 #: en/git-send-email.txt:170
+#, fuzzy, no-wrap, priority:100
+#| msgid "--to-cmd=<command>"
+msgid "--sendmail-cmd=<command>"
+msgstr "--to-cmd=<comando>"
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
 #, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr "--smtp-encryption=<criptografia>"
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr "Define a criptografia que ser찼 utilizada, 'ssl' ou 'tls'.  Qualquer outro valor 챕 revertido para o SMTP simples.  A predefini챌찾o 챕 o valor da op챌찾o de configura챌찾o `sendemail.smtpEncryption`."
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr "--smtp-domain=<FQDN>"
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr "Define o Nome de Dom챠nio Totalmente Qualificado (FQDN) utilizado no comando HELO/EHLO para o servidor SMTP.  Alguns servidores exigem que o FQDN corresponda ao seu endere챌o de IP.  Caso n찾o esteja definido, o comando `git send-email` tenta determinar o seu FQDN de forma autom찼tica.  A predefini챌찾o 챕 o valor da op챌찾o de configura챌찾o `sendemail.smtpDomain`."
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr "--smtp-auth=<mecanismos>"
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr "Mecanismos SMTP-AUTH permitidos, listas separadas por um espa챌o. Est찼 configura챌찾o imp천em a utiliza챌찾o dos mecanismos listados. Exemplo:"
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr "Caso pelo menos um dos mecanismos definidos coincidir com os anunciados atrav챕s do servidor SMTP e caso seja compat챠vel pela biblioteca SASL utilizada, o mecanismo ser찼 utilizado para a autentica챌찾o. Caso nem a op챌찾o de configura챌찾o 'sendemail.smtpAuth' nem a op챌찾o `--smtp-auth` forem utilizados, todos os mecanismos compat챠veis atrav챕s da biblioteca SASL poder찾o ser utilizados. O valor especial 'none' pode ser informado para desativar completamente a autentica챌찾o, independentemente da op챌찾o `--smtp-user`"
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr "--smtp-pass[=<senha>]"
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr "A senha para o SMTP-AUTH. O argumento 챕 opcional: Caso nenhum argumento seja definido, ent찾o um valor vazio 챕 utilizado como uma senha. A predefini챌찾o 챕 o valor da op챌찾o de configura챌찾o `sendemail.smtpPass`, no entanto, a op챌찾o `--smtp-pass` sempre substitui este valor."
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr "Al챕m disso, as senhas n찾o precisam ser definidas nos arquivos de configura챌찾o ou na linha de comando. Caso um nome de usu찼rio seja definido (com `--smtp-user` ou` `sendemail.smtpUser`), por챕m nenhuma senha seja definida (com `--smtp-pass` ou `sendemail.smtpPass`), uma senha 챕 obtida utilizando o comando 'git-credential'."
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr "Desative a autentica챌찾o SMTP. 횋 um atalho para `--smtp-auth=none`"
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr "--smtp-server=<host>"
 
 #. type: Plain text
-#: en/git-send-email.txt:221
-#, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+#: en/git-send-email.txt:226
+#, fuzzy, priority:100
+#| msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
 msgstr "Caso seja definido, define qual o servidor SMTP deve ser utilizado (por exemplo, um dom챠nio `smtp.example.com` ou um endere챌o IP).  Como alternativa, 챕 poss챠vel definir um nome do caminho completo de um programa semelhante ao sendmail; o programa deve ser compat챠vel com a op챌찾o `-i`.  O valor predefinido pode ser definido atrav챕s da op챌찾o de configura챌찾o `sendemail.smtpServer`; a predefini챌찾o interna 챕 procurar pelo `sendmail` em `/usr/sbin`, `/usr/lib` e `$PATH` caso este programa esteja dispon챠vel, caso contr찼rio retorna ao `localhost`."
 
+#. type: Plain text
+#: en/git-send-email.txt:232
+#, priority:100
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr "--smtp-server-port=<porta>"
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr "Define uma porta diferente da porta predefinida (os servidores SMTP normalmente ouvem na porta 25 smtp, por챕m tamb챕m podem ouvir na porta de envio ou a porta smtp SSL comum 465); os nomes das portas simb처licos (por exemplo, \"submission\" em vez do 587) tamb챕m s찾o aceitos. A porta tamb챕m pode ser definida com a vari찼vel de configura챌찾o `sendemail.smtpServerPort`."
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr "--smtp-server-option=<op챌찾o>"
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr "Caso seja definido, define qual a op챌찾o da sa챠da que ser찼 usada pelo servidor SMTP.  O valor predefinido pode ser definido pela op챌찾o de configura챌찾o `sendemail.smtpServerOption`."
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr "A op챌찾o `--smtp-server-option` deve ser repetida para cada op챌찾o que voc챗 queira passar para o servidor. Da mesma forma, as linhas diferentes nos arquivos de configura챌찾o devem ser utilizadas para cada op챌찾o."
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr "Legado para o pseud척nimo '--smtp-encryption ssl'."
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr "O caminho para um armazenamento dos certificados CA confi찼veis para a valida챌찾o do certificado SMTP SSL/TLS (um diret처rio que foi processado pelo 'c_rehash' ou um 첬nico arquivo contendo um ou mais certificados no formato 'PEM' concatenados juntos: consulte 'verify(1)' '-CAfile' e '-CApath' para mais informa챌천es sobre eles). Defina-o como um texto vazio para desativar a verifica챌찾o do certificado. A predefini챌찾o retorna para o valor da vari찼vel de configura챌찾o `sendemail.smtpsslcertpath`, caso seja definida, ou tenha a biblioteca de apoio SSL tenha sido compilada (o que deve ser a melhor op챌찾o na maioria das plataformas)."
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr "--smtp-user=<usu찼rio>"
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr "O nome do usu찼rio para o SMTP-AUTH. A predefini챌찾o 챕 o valor da op챌찾o de configura챌찾o `sendemail.smtpUser`; caso um nome de usu찼rio n찾o tenha sido definido(com `--smtp-user` ou `sendemail.smtpUser`), a tentativa de autentica챌찾o n찾o ser찼 realizada."
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr "--smtp-debug=0|1"
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr "Ative (1) ou desative (0) a gera챌찾o da depura챌찾o. Se ativado, os comandos e respostas SMTP ser찾o impressos. 횣til para depurar problemas de conex찾o e a autentica챌찾o TLS."
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr "--batch-size=<num>"
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr "Alguns servidores de e-mail (smtp.163.com por exemplo) limitam a quantidade de e-mails que podem ser enviados por sess찾o (conex찾o) e isso causa uma falha no envio de muitas mensagens.  Com esta op챌찾o, o \"send-email\" ser찼 desconectado ap처s enviar a quantidade de `$<num>` mensagens e aguardar찼 alguns segundos (consulte --relogin-delay) e far찼 a reconex찾o para contornar esse limite.  횋 poss챠vel utilizar alguma forma de auxiliar a credencial evitando a necessidade de redigitar a sua senha sempre que isso acontecer.  A predefini챌찾o retorna para o valor da vari찼vel de configura챌찾o `sendemail.smtpBatchSize`."
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr "--relogin-delay=<int>"
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr "Aguardando `$<int>` segundos antes de se reconectar ao servidor SMTP. Utilizado em conjunto com a op챌찾o `--batch-size`.  A predefini챌찾o retorna para o valor da vari찼vel de configura챌찾o `sendemail.smtpReloginDelay`."
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr "Automatizando"
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr "--no-[to|cc|bcc]"
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, priority:100
 msgid "Clears any list of \"To:\", \"Cc:\", \"Bcc:\" addresses previously set via config."
 msgstr "Limpa qualquer lista dos endere챌os \"Para:\", \"Cc:\", \"Cco:\" definidos anteriormente atrav챕s da config."
 
 #. type: Labeled list
-#: en/git-send-email.txt:285
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, priority:100
 msgid "Clears the previously read value of `sendemail.identity` set via config, if any."
 msgstr "Limpa o valor lido anteriormente do `sendemail.identity` definido atrav챕s da config, caso exista."
 
 #. type: Labeled list
-#: en/git-send-email.txt:289
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr "--to-cmd=<comando>"
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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 "Define um comando que ser찼 executado um por vez no arquivo patch que deve gerar as entradas \"Para:\".  A sa챠da deste comando deve ser um endere챌o de e-mail 첬nico por linha.  A predefini챌찾o 챕 o valor da op챌찾o de configura챌찾o 'sendemail.tocmd'."
 
 #. type: Labeled list
-#: en/git-send-email.txt:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr "--cc-cmd=<comando>"
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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 "Define um comando que ser찼 executado um por vez no arquivo patch que deve gerar as entradas \"Cc:\".  A sa챠da deste comando deve ser um endere챌o de e-mail 첬nico por linha.  A predefini챌찾o 챕 o valor da op챌찾o de configura챌찾o `sendemail.ccCmd`."
 
 #. type: Labeled list
-#: en/git-send-email.txt:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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 "Caso esteja definido, cada e-mail ser찼 enviado como uma resposta ao e-mail enviado anteriormente.  Caso esteja desativado com a op챌찾o \"--no-chain-reply-to\", todos os e-mails posteriores ao primeiro, ser찾o enviados como respostas para o primeiro e-mail enviado.  Ao utilizar isso, 챕 recomend찼vel que o primeiro arquivo utilizado seja uma vis찾o geral de toda a s챕rie de patches. 횋 predefinido que esteja desativada, por챕m a vari찼vel de configura챌찾o `sendemail.chainReplyTo` pode ser utilizada para ativ찼-la."
 
 #. type: Labeled list
-#: en/git-send-email.txt:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr "--identity=<identidade>"
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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 "Uma identidade de configura챌찾o. Quando informado, faz com que os valores na subse챌찾o 'sendemail.<identidade>' tenham preced챗ncia sobre os valores na se챌찾o 'sendemail'. A identidade predefinida 챕 o valor existente em `sendemail.identity`."
 
 #. type: Labeled list
-#: en/git-send-email.txt:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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 "Caso esteja definido, adicione os e-mails encontrados em 'Signed-off-by:' ou Cc: 횪 lista cc. A predefini챌찾o 챕 o valor da op챌찾o de configura챌찾o `sendemail.signedoffbycc`; caso n찾o seja definido, a predefini챌찾o retorna para `--signed-off-by-cc`."
 
 #. type: Labeled list
-#: en/git-send-email.txt:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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 "Caso seja definido, os emails encontrados nos cabe챌alhos Cc: no primeiro patch da s챕rie (normalmente a carta de apresenta챌찾o) ser찾o adicionados 횪 lista Cc: de cada conjunto de e-mails. Default is the value of 'sendemail.cccover' configuration value; if that is unspecified, default to --no-cc-cover."
 
 #. type: Labeled list
-#: en/git-send-email.txt:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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 "Caso seja definido, os emails encontrados nos cabe챌alhos To: (Para) no primeiro patch da s챕rie (normalmente a carta de apresenta챌찾o) ser찾o adicionados 횪 lista To: de cada conjunto de e-mails. Default is the value of 'sendemail.tocover' configuration value; if that is unspecified, default to --no-to-cover."
 
 #. type: Labeled list
-#: en/git-send-email.txt:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr "--suppress-cc=<categoria>"
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr "Define uma categoria adicional dos destinat찼rios para suprimir o 'auto-cc' do:"
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr "'author' ir찼 evitar a inclus찾o o autor do patch."
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr "'self' evitar찼 incluir o remetente."
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, priority:100
 msgid "'cc' will avoid including anyone mentioned in Cc lines in the patch header except for self (use 'self' for that)."
 msgstr "'cc' ir찼 evitar a inclus찾o de qualquer pessoa mencionada nas linhas Cc no cabe챌alho do patch, exceto self (utilize 'self' para isso)."
 
 #. type: Plain text
-#: en/git-send-email.txt:343
+#: en/git-send-email.txt:354
 #, 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 "'bodycc' ir찼 evitar a inclus찾o de qualquer pessoa mencionada nas linhas Cc no corpo do patch (mensagem do commit), exceto o 'self' (utilize 'self' para isso)."
 
 #. type: Plain text
-#: en/git-send-email.txt:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr "O 'sob' evitar찼 incluir qualquer pessoa mencionada nas linhas `Signed-off-by`, exceto para 'self' (utilize 'self' para isso)."
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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 "O 'misc-by' evitar찼 incluir qualquer pessoa mencionada nas linhas 'Acked-by' (Reconhecido-por), 'Review-by' (Revisado-por), 'Tested-by' (Testado-por) e outras linhas \"by-by\" no corpo do patch, exceto o 'Signed-off-by' (Assinado-por) (utilize 'sob' para tanto)."
 
 #. type: Plain text
-#: en/git-send-email.txt:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr "'cccmd' evitar찼 executar o --cc-cmd."
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr "'body' 챕 o equivalente a 'sob' + 'bodycc' + 'misc-by'."
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr "'all' ir찼 suprimir todos os valores cc de maneira autom찼tica."
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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 "A predefini챌찾o 챕 o valor da configura챌찾o `sendemail.suppresscc`; caso isso n찾o seja definido, a predefini챌찾o ser찼 `self` caso `--suppress-from` seja utilizado, bem como `body` caso `--no-selected-off-cc` seja utilizado."
 
 #. type: Labeled list
-#: en/git-send-email.txt:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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 "Caso esteja definido, n찾o adicione o endere챌o From: 횪 lista cc:.  A predefini챌찾o 챕 o valor da op챌찾o de configura챌찾o `sendemail.suppressFrom`; caso n찾o seja definido, a predefini챌찾o retorna para `--no-suppress-from`."
 
 #. type: Labeled list
-#: en/git-send-email.txt:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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 "Caso esteja definido, os cabe챌alhos 'In-Reply-To' e as Refer챗ncias ser찾o adicionadas em cada e-mail enviado.  Se cada e-mail se refere ao e-mail anterior (`deep` encadeado por 'git format-patch') ou ao primeiro e-mail (encadeamento `shallow`) 챕 governado por \"--[no-]chain-reply-to\"."
 
 #. type: Plain text
-#: en/git-send-email.txt:373
+#: en/git-send-email.txt:384
 #, 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 "Caso seja desativado com a op챌찾o \"--no-thread\", estes cabe챌alhos n찾o ser찾o adicionados (a menos que seja especificado com a op챌찾o `--in-reply-to`).  A predefini챌찾o 챕 o valor da op챌찾o de configura챌찾o `sendemail.thread`; caso n찾o esteja definido, a predefini챌찾o retorna para `--thread`."
 
 #. type: Plain text
-#: en/git-send-email.txt:379
+#: en/git-send-email.txt:390
 #, 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 "횋 responsabilidade do usu찼rio garantir que j찼 n찾o exista um cabe챌alho 'In-Reply-To' quando o comando 'git send-email' for solicitado para adicion찼-lo (em especial, observe que o comando 'git format-patch' pode ser configurado para realizar o encadeamento ele mesmo).  N찾o fazer isso pode n찾o produzir o resultado desejado no MUA do destinat찼rio."
 
 #. type: Title ~
-#: en/git-send-email.txt:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr "Administrando"
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr "--confirm=<modo>"
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr "Apenas confirme antes de enviar:"
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr "'always' sempre pedir찼 confirma챌찾o antes do envio"
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr "O 'never' nunca ir찼 confirmar antes do envio"
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, priority:100
 msgid "'cc' will confirm before sending when send-email has automatically added addresses from the patch to the Cc list"
 msgstr "'cc' ir찼 pedir uma confirma챌찾o antes do envio quando o \"send-email\" tiver adicionado de forma autom찼tica os endere챌os do patch 횪 lista Cc"
 
 #. type: Plain text
-#: en/git-send-email.txt:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr "'compose' (compor) ir찼 confirmar antes de enviar a primeira mensagem ao utilizar o `--compose`."
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr "'auto' 챕 o equivalente a 'cc' + 'compose' (compor)"
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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 "A predefini챌찾o 챕 o valor da configura챌찾o `sendemail.confirm`; caso isso n찾o seja definido, utilize a predefini챌찾o `auto`, a menos que alguma das op챌천es da supress찾o tenha sido utilizada; nesse caso, a predefini챌찾o ser찼 `compose`."
 
 #. type: Plain text
-#: en/git-send-email.txt:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr "Fa챌a tudo, exceto realmente enviar os e-mails."
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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 "Quando um argumento pode ser entendido como uma refer챗ncia ou como um nome do arquivo, entenda-o como um argumento do formato do patch (`--format-patch`) ou como um nome de arquivo (`--no-format-patch` ) 횋 predefinido que quando este conflito ocorra, o 'git send-email' seja encerrado."
 
 #. type: Plain text
-#: en/git-send-email.txt:412
+#: en/git-send-email.txt:423
 #, priority:100
 msgid "Make git-send-email less verbose.  One line per email should be all that is output."
 msgstr "Torne o comando 'git-send-email' menos detalhado.  Deve ser gerado apenas uma linha por e-mail."
 
 #. type: Labeled list
-#: en/git-send-email.txt:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr "Realize verifica챌천es de sanidade nos patches.  Atualmente, a valida챌찾o significa o seguinte:"
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr "Se presente, chame o gancho de valida챌찾o do sendmail (consulte linkgit:githooks[5])."
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr "Aviso dos patches que contenham linhas mais longas que"
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -49365,151 +49502,151 @@ msgstr ""
 "http://www.ietf.org/rfc/rfc5322.txt.\n"
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, priority:100
 msgid "Default is the value of `sendemail.validate`; if this is not set, default to `--validate`."
 msgstr "A predefini챌찾o 챕 o valor do `sendemail.validate`; caso j찼 n찾o estiver definido, a predefini챌찾o retorna para `--validate`."
 
 #. type: Plain text
-#: en/git-send-email.txt:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr "Envie os e-mails mesmo que as verifica챌천es de seguran챌a as impe챌am."
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr "Informa챌찾o"
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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 "Em vez da opera챌찾o normal, despeje os nomes dos pseud척nimos dos atalhos vindo do arquivo de configura챌찾o de pseud척nimos, um por linha e em ordem alfab챕tica. Observe que isso inclui apenas o pseud척nimo e n찾o os seus endere챌os de e-mail que foram expandidos.  Para obter mais informa챌천es sobre pseud척nimos, consulte 'sendemail.aliasesfile'."
 
 #. type: Labeled list
-#: en/git-send-email.txt:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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 "Para evitar a digita챌찾o dos longos endere챌os de e-mail, aponte para um ou mais arquivos aliases do e-mail.  Voc챗 tamb챕m deve informar o `sendemail.aliasFileType`."
 
 #. type: Labeled list
-#: en/git-send-email.txt:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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 "Formato do(s) arquivo(s) definidos(s) em `sendemail.aliasesFile`. Deve ser 'mutt', 'mailrc', 'pine', 'elm', 'gnus' ou 'sendmail'."
 
 #. type: Plain text
-#: en/git-send-email.txt:458
+#: en/git-send-email.txt:469
 #, 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 "A apar챗ncia de um arquivo alias em cada formato pode ser encontrada na documenta챌찾o do programa do e-mail com o mesmo nome. As diferen챌as e as limita챌천es dos formatos predefinidas s찾o descritas abaixo:"
 
 #. type: Labeled list
-#: en/git-send-email.txt:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr "sendmail"
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr "Os aliases e os endere챌os citados n찾o s찾o compat챠veis: linhas que"
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr "contenham o s챠mbolo `\"` s찾o ignorados."
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr "O redirecionamento para um arquivo (`/nome/do/caminho`) ou pipe (`|comando`) n찾o 챕"
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr "suportado."
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr "A inclus찾o dos arquivos (`:include: /path/nome`) n찾o 챕 suportada."
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr "Os avisos s찾o impressos na sa챠da de erro predefinido para qualquer"
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, priority:100
 msgid "explicitly unsupported constructs, and any other lines that are not recognized by the parser."
 msgstr "constru챌천es explicitamente n찾o suportadas e quaisquer outras linhas que n찾o sejam reconhecidas pelo analisador."
 
 #. type: Labeled list
-#: en/git-send-email.txt:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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 "Caso o valor seja `true` (predefinido), uma 첬nica inst창ncia do editor ser찼 gerada para editar os arquivos que precisam ser editados (os patches quando `--annotate` 챕 utilizado e o resumo quando `--compose` 챕 utilizado). Caso o valor seja `false`, os arquivos ser찾o editados um ap처s o outro, onde um novo editor 챕 aberto a cada vez."
 
 #. type: Labeled list
-#: en/git-send-email.txt:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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 "Define a predefini챌찾o para confirmar antes do envio. Deve ser um de 'always' (sempre), 'never' (nunca), 'cc' (com c처pia), 'compose' (compor) ou 'auto'. Consulte `--confirm` na se챌찾o anterior para obter o significado destes valores."
 
 #. type: Title ~
-#: en/git-send-email.txt:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr "Utilize o gmail como servidor smtp"
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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 "Para usar o 'git send-email' para enviar os seus patches atrav챕s do servidor SMTP do GMail, edite '~/.gitconfig' para definir as configura챌천es da sua conta:"
 
 #. type: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -49525,25 +49662,25 @@ msgstr ""
 "\tsmtpServerPort = 587\n"
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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 "Caso opte pela autentica챌찾o em v찼rias etapas configurada na sua conta do Gmail, ser찼 necess찼rio gerar uma senha espec챠fica do aplicativo para que possa ser usado com o comando 'git send-email'. Visite o link https://security.google.com/settings/security/apppasswords para cri찼-la."
 
 #. type: Plain text
-#: en/git-send-email.txt:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr "Caso n찾o tenha a autentica챌찾o em v찼rias etapas configurada na sua conta do Gmail, ser찼 necess찼rio permitir o acesso ao aplicativo menos seguro. Visite o link https://myaccount.google.com/lesssecureapps para ativ찼-la."
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, priority:100
 msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
 msgstr "Quando os seus commits estiverem prontos para serem enviadas para a lista de discuss찾o, execute os seguintes comandos:"
 
 #. type: Plain text
-#: en/git-send-email.txt:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -49555,19 +49692,19 @@ msgstr ""
 "\t$ git send-email outgoing/*\n"
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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 "As suas credenciais ser찾o solicitadas na primeira vez em que voc챗 execut찼-lo.  Entre com as credenciais espec챠ficas do aplicativo ou a sua senha normal conforme for o caso.  Caso tenha o auxiliar de credencial configurado (consulte linkgit:git-credential[1]), a senha ser찼 salva no armazenamento de credenciais para que voc챗 n찾o precise digit찼-la na pr처xima vez."
 
 #. type: Plain text
-#: en/git-send-email.txt:522
+#: en/git-send-email.txt:533
 #, 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 "Observa챌찾o: os seguintes m처dulos Perl talvez j찼 estejam instalados com a sua distribui챌찾o Perl, caso contr찼rio, estes m처dulos s찾o necess찼rios: MIME::Base64, MIME::QuotedPrint, Net::Domain e Net::SMTP.  Estes m처dulos Perl tamb챕m s찾o necess찼rios: Authen::SASL and Mail::Address."
 
 #. type: Plain text
-#: en/git-send-email.txt:527
+#: en/git-send-email.txt:538
 #, 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)"
@@ -51208,7 +51345,19 @@ msgid ""
 "'git stash' clear\n"
 "'git stash' create [<message>]\n"
 "'git stash' store [-m|--message <message>] [-q|--quiet] <commit>\n"
-msgstr "'git stash' list [<op챌천es-do-log>]\n'git stash' show [-u|--include-untracked|--only-untracked] [<op챌천es-do-diff] [<stash>]\n'git stash' drop [-q|--quiet] [<stash>]\n'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]\n'git stash' branch <nome-do-ramo> [<stash>]\n'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n\t     [-u|--include-untracked] [-a|--all] [-m|--message <mensagem>]\n\t     [--pathspec-from-file=<arquivo> [--pathspec-file-nul]]\n\t     [--] [<pathspec>...]]\n'git stash' clear\n'git stash' create [<mensagem>]\n'git stash' store [-m|--message <mensagem>] [-q|--quiet] <commit>\n"
+msgstr ""
+"'git stash' list [<op챌천es-do-log>]\n"
+"'git stash' show [-u|--include-untracked|--only-untracked] [<op챌천es-do-diff] [<stash>]\n"
+"'git stash' drop [-q|--quiet] [<stash>]\n"
+"'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]\n"
+"'git stash' branch <nome-do-ramo> [<stash>]\n"
+"'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"\t     [-u|--include-untracked] [-a|--all] [-m|--message <mensagem>]\n"
+"\t     [--pathspec-from-file=<arquivo> [--pathspec-file-nul]]\n"
+"\t     [--] [<pathspec>...]]\n"
+"'git stash' clear\n"
+"'git stash' create [<mensagem>]\n"
+"'git stash' store [-m|--message <mensagem>] [-q|--quiet] <commit>\n"
 
 #. type: Plain text
 #: en/git-stash.txt:31
@@ -51293,253 +51442,254 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr "show [-u|--include-untracked|--only-untracked] [<op챌천es-do-diff>] [<stash>]"
 
 #. type: Plain text
-#: en/git-stash.txt:96
-#, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+#: en/git-stash.txt:98
+#, fuzzy, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr "Exiba as altera챌천es registradas na entrada 'stash' como uma diferen챌a entre o conte첬do oculto e o commit quando a entrada stash for criada.  횋 predefinido que o comando exiba o \"diffstat\", por챕m aceite qualquer formato informado pelo comando 'git diff' (por exemplo, `git stash show -p stash@{1}` para exibir a segunda entrada mais recente em formato patch).  Voc챗 pode usar as vari찼veis de configura챌찾o `stash.showIncludeUntracked`, `stash.showStat` e `stash.showPatch` para alterar o comportamento predefinido."
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr "pop [--index] [-q|--quiet] [<stash>]"
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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 "Remova a 첬nica condi챌찾o do empilhamento da lista e aplique-o sobre a condi챌찾o atual da 찼rvore de trabalho, ou seja, fa챌a a opera챌찾o inversa do comando `git stash push`. O diret처rio de trabalho deve corresponder ao 챠ndice. O diret처rio de trabalho deve coincidir com o 챠ndice."
 
 #. type: Plain text
-#: en/git-stash.txt:107
+#: en/git-stash.txt:109
 #, 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 "A aplica챌찾o da condi챌찾o pode falhar com conflitos; neste caso, ele n찾o 챕 removido da lista 'stash'. 횋 necess찼rio resolver os conflitos manualmente e chamar o comando `git stash drop` manualmente depois."
 
 #. type: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr "apply [--index] [-q|--quiet] [<stash>]"
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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 "Como `pop ', por챕m n찾o remova a condi챌찾o da lista de estoque 'stash'. Diferente de `pop`, `<stash>` pode ser qualquer commit que se pare챌a com um commit criado atrav챕s do comando `stash push` ou `stash create`."
 
 #. type: Labeled list
-#: en/git-stash.txt:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr "branch <nome-do-ramo> [<stash>]"
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr "Cria e efetua a averigua챌찾o de um novo ramo chamado `<nome-do-ramo>` iniciando a partir do commit onde o `<stash>` foi criado originalmente, aplica as altera챌천es registradas do `<stash>` na nova 찼rvore de trabalho e no 챠ndice.  Caso seja bem-sucedido, e `<stash>` for uma refer챗ncia do formul찼rio `stash@{<revision>}`, ele liberar찼 o `<stash>`."
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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 "횋 첬til caso o ramo onde voc챗 executou o `git stash push` mude o suficiente para que o `git stash apply` falhe devido aos conflitos. Como a entrada que est찼 acumulada \"stash\" 챕 aplicada no topo do commit que era o `HEAD` no momento onde o `git stash` foi executado, ela restaura a condi챌찾o originalmente armazenada e sem os conflitos."
 
 #. type: Labeled list
-#: en/git-stash.txt:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr "clear"
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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 "Remova todos os lan챌amentos que estiverem armazenados. Observe que estas entradas estar찾o sujeitas a remo챌찾o e podem ser imposs챠veis de serem recuperadas (consulte 'Exemplos' abaixo para uma poss챠vel estrat챕gia)."
 
 #. type: Labeled list
-#: en/git-stash.txt:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr "drop [-q|--quiet] [<stash>]"
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr "Remova uma 첬nica entrada \"stash\" da lista das entradas \"stash\"."
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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 "Crie uma entrada \"stash\" (que 챕 um objeto commit comum) e retorne seu nome de objeto, sem armazen찼-la em qualquer outro lugar no espa챌o de nomes \"ref\".  Isso tem a inten챌찾o de ser 첬til para scripts.  Provavelmente n찾o 챕 o comando que voc챗 deseja usar; veja o \"push\" acima."
 
 #. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr "store"
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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 "Armazene um determinado \"stash\" criado atrav챕s do comando 'git stash create' (que 챕 um commit pendente de mesclagem) na \"ref\" determinada, atualizando o \"reflog\" do \"stash\".  Isso tem a inten챌찾o de ser 첬til para scripts.  Provavelmente n찾o 챕 o comando que voc챗 deseja usar; veja o \"push\" acima."
 
 #. type: Plain text
-#: en/git-stash.txt:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr "Esta op챌찾o s처 챕 v찼lida para os comandos `push` e `save`."
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr "Todos os arquivos ignorados e n찾o monitorados tamb챕m s찾o armazenados em cache e limpos com o comando `git clean`."
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr "Quando usado em conjunto com os comandos `push` e `save`, todos os arquivos n찾o monitorados tamb챕m s찾o armazenados em cache e limpos com o comando `git clean`."
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr "Quando usado com o comando `show`, mostra os arquivos n찾o rastreados na entrada acumulada como parte do diff."
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `show`."
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr "Mostra apenas os arquivos n찾o rastreados na entrada do stash como parte do diff."
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr "Esta op챌찾o s처 챕 v찼lida para os comandos `pop` e `apply`."
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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 "Tenta restabelecer n찾o apenas as altera챌천es da 찼rvore de trabalho, mas tamb챕m as do 챠ndice. No entanto, isso pode falhar quando h찼 conflitos (que s찾o armazenados no 챠ndice e portanto, n찾o 챕 mais poss챠vel aplicar as altera챌천es como eram originalmente)."
 
 #. type: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr "Todas as altera챌천es que j찼 foram adicionadas ao 챠ndice n찾o s찾o alteradas."
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr "Selecione a diferen챌a entre os blocos interativamente entre HEAD e a 찼rvore de trabalho a serem armazenados.  A entrada \"stash\" 챕 constru챠da de maneira que a condi챌찾o geral do 챠ndice seja a mesma que a condi챌찾o geral do 챠ndice do seu reposit처rio e a sua 찼rvore de trabalho contenha apenas as altera챌천es que voc챗 selecionou de forma interativa.  As altera챌천es selecionadas ser찾o revertidas a partir da sua 찼rvore de trabalho. Consulte a se챌찾o ``Modo Interativo'' do linkgit:git-add[1] para aprender como operar o modo `--patch`."
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr "A op챌찾o `--patch` implica no uso da op챌찾o `--keep-index`.  Voc챗 pode usar a `--no-keep-index` para substituir isso."
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `push`."
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr "Esta op챌찾o s처 챕 v찼lida para os comandos `apply`, `drop`, `pop`, `push`, `save` e `store`."
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr "Separa o 'pathspec' das op챌천es para fins de desambigua챌찾o."
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr "A nova entrada stash registra as condi챌천es alteradas apenas para os arquivos que coincidam com o 'pathspec'.  As entradas de 챠ndice e os arquivos da 찼rvore de trabalho s찾o revertidos para a condi챌찾o no `HEAD` apenas para estes arquivos, deixando tamb챕m os arquivos que n찾o correspondem ao 'pathspec' intactos."
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr "<stash>"
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr "Esta op챌찾o s처 챕 v찼lida para os comandos `apply`, `branch`, `drop`, `pop` e `show`."
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr "Uma refer챗ncia do formul찼rio `stash@{<revis찾o>}`. Quando nenhum `<stash>` 챕 informado, o 첬ltimo \"stash\" 챕 assumido (ou seja, `stash@{0}`)."
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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 "Um lan챌amento na 'stash' 챕 representado como um commit cuja 찼rvore registra a condi챌찾o do diret처rio de trabalho e a sua primeira origem 챕 o commit no `HEAD` quando a entrada foi criada.  A 찼rvore da segunda origem registra a condi챌찾o do 챠ndice quando o lan챌amento 챕 feito, e 챕 feito um herdeiro do commit `HEAD`.  O grafo de ascend챗ncia fica assim:"
 
 #. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -51551,31 +51701,31 @@ msgstr ""
 "     -----H----I\n"
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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 "onde `H` 챕 o commit `HEAD`, `I` 챕 um commit que registra a condi챌찾o do 챠ndice e `W` 챕 um commit que registra a condi챌찾o da 찼rvore de trabalho."
 
 #. type: Labeled list
-#: en/git-stash.txt:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr "Obtendo de um diret처rio sujo"
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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 "Quando voc챗 est찼 no meio de alguma coisa, aprende que h찼 altera챌천es upstream que s찾o possivelmente relevantes para o que voc챗 est찼 fazendo.  Quando as suas altera챌천es locais n찾o entrarem em conflito com as altera챌천es na \"upstream\", um simples `git pull` permitir찼 que voc챗 avance."
 
 #. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:286
 #, 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 "No entanto, h찼 casos onde as suas altera챌천es locais entram em conflito com as altera챌천es na upstream, e o `git pull` se recusa a sobrescrever as suas altera챌천es.  Nesse caso, 챕 poss챠vel ocultar as suas altera챌천es, executar um 'pull' e remover do armazenamento da seguinte maneira:"
 
 #. type: delimited block -
-#: en/git-stash.txt:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -51593,13 +51743,13 @@ msgstr ""
 "$ git stash pop\n"
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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 "Quando voc챗 est찼 no meio de alguma coisa, seu chefe entra e exige que voc챗 conserte algo imediatamente.  Tradicionalmente, voc챗 faria um commit em um ramo tempor찼rio para armazenar as suas altera챌천es e retornava ao ramo original para fazer a corre챌찾o de emerg챗ncia, assim:"
 
 #. type: delimited block -
-#: en/git-stash.txt:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -51623,13 +51773,13 @@ msgstr ""
 "# ... continue a hackear ...\n"
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr "Voc챗 pode utilizar o comando 'git stash' para simplificar o exemplo acima:"
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -51647,19 +51797,19 @@ msgstr ""
 "# ... continue a hackear ...\n"
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr "Testando commits parciais"
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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 "Voc챗 pode utilizar o comando `git stash push --keep-index` quando quiser fazer dois ou mais commits das altera챌천es na 찼rvore de trabalho e queira testar cada uma das altera챌천es antes de fazer o commit:"
 
 #. type: delimited block -
-#: en/git-stash.txt:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -51683,19 +51833,19 @@ msgstr ""
 "$ git commit foo -m 'Partes resultantes'\n"
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr "Recuperando entradas \"stash\" que foram limpas/eliminadas erroneamente"
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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 "Caso voc챗 derrube ou limpe as entradas \"stash\" por engano, elas n찾o poder찾o mais ser recuperadas pelos mecanismos de seguran챌a normais.  No entanto, 챕 poss챠vel tentar o seguinte encantamento para obter uma lista das entradas stash que ainda est찾o em seu reposit처rio, mas que n찾o s찾o mais acess챠veis:"
 
 #. type: delimited block -
-#: en/git-stash.txt:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -51707,7 +51857,7 @@ msgstr ""
 "xargs git log --merges --no-walk --grep=WIP\n"
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -53943,7 +54093,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr "git config --get-all svn-remote.<nome>.commiturl"
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -56322,7 +56472,13 @@ msgid ""
 "    [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
 "    [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
 "    <command> [<args>]\n"
-msgstr "'git' [--version] [--help] [-C <caminho>] [-c <nome>=<valor>]\n    [--exec-path[=<caminho>]] [--html-path] [--man-path] [--info-path]\n    [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n    [--git-dir=<caminho>] [--work-tree=<caminho>] [--namespace=<nome>]\n    [--super-prefix=<caminho>][--config-env=<nome>=<envvar>]\n    <comando> [<args>]\n"
+msgstr ""
+"'git' [--version] [--help] [-C <caminho>] [-c <nome>=<valor>]\n"
+"    [--exec-path[=<caminho>]] [--html-path] [--man-path] [--info-path]\n"
+"    [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n"
+"    [--git-dir=<caminho>] [--work-tree=<caminho>] [--namespace=<nome>]\n"
+"    [--super-prefix=<caminho>][--config-env=<nome>=<envvar>]\n"
+"    <comando> [<args>]\n"
 
 #. type: Plain text
 #: en/git.txt:24
@@ -60270,9 +60426,18 @@ msgstr "git-worktree - Gerencie as v찼rias 찼rvores de trabalho"
 
 #. type: Plain text
 #: en/git-worktree.txt:20
-#, ignore-ellipsis, no-wrap, priority:240
-msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+#, fuzzy, ignore-ellipsis, no-wrap, priority:240
+#| msgid ""
+#| "'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+#| "'git worktree list' [--porcelain]\n"
+#| "'git worktree lock' [--reason <string>] <worktree>\n"
+#| "'git worktree move' <worktree> <new-path>\n"
+#| "'git worktree prune' [-n] [-v] [--expire <expire>]\n"
+#| "'git worktree remove' [-f] <worktree>\n"
+#| "'git worktree repair' [<path>...]\n"
+#| "'git worktree unlock' <worktree>\n"
+msgid ""
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -60586,8 +60751,9 @@ msgstr "--reason <texto>"
 
 #. type: Plain text
 #: en/git-worktree.txt:246
-#, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+#, fuzzy, priority:240
+#| msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr "Com `lock`, uma explica챌찾o 챕 dada do por qu챗 a 찼rvore est찼 \"locked\" (travada)."
 
 #. type: Labeled list
@@ -60780,11 +60946,16 @@ msgstr "`prunable`, caso a 찼rvore de trabalho possa ser podada atrav챕s do coma
 
 #. type: delimited block -
 #: en/git-worktree.txt:392
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
+#| msgid ""
+#| "$ git worktree list\n"
+#| "/path/to/linked-worktree    abcd1234 [master]\n"
+#| "/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+#| "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 "$ git worktree list\n"
@@ -61302,8 +61473,9 @@ msgstr "[[def_fast_forward]]fast-forward (avan챌o-r찼pido)"
 
 #. type: Plain text
 #: en/glossary-content.txt:153
-#, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+#, fuzzy, priority:100
+#| msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr "Um avan챌o r찼pido 챕 um tipo especial de <<def_merge,mesclagem>>, onde voc챗 tem uma <<def_revision,revis찾o>> e est찼 \"mesclando\" outras altera챌천es do <<def_branch,ramo>> que s찾o descendentes do que voc챗 tem. Nesse caso, voc챗 n찾o faz um <<def_merge,merge>> <<def_commit,commit>>, apenas atualiza a revis찾o dele. Isso acontecer찼 frequentemente em um <<def_remote_tracking_branch,ramo monitorado remotamente>> de um <<def_repository,reposit처rio>> remoto."
 
 #. type: Labeled list
@@ -65030,194 +65202,231 @@ msgstr "Ao especificar v찼rias revis천es significa que o conjunto dos commits ac
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr "O conjunto acess챠vel de um commit 챕 o pr처prio commit e o commit em sua cadeia de ancestrais."
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr "Exclus천es de Commits"
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr "'{caret}<rev>' (caret) Nota챌찾o"
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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 "Para excluir os commits acess챠veis de um commit, 챕 usada uma nota챌찾o de prefixo '{caret}'.  Por exemplo, '{caret}r1 r2' significa os commits acess챠veis de 'r2' por챕m exclui aqueles acess챠veis do 'r1' (por exemplo, 'r1' e os seus ancestrais)."
 
 #. type: Title ~
-#: en/revisions.txt:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr "Nota챌천es do Intervalo Pontilhado"
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr "A faixa de nota챌찾o de intervalo '..' (dois pontos)"
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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 "A opera챌찾o do conjunto '{caret}r1 r2' aparece com tanta frequ챗ncia que existe uma abrevia챌찾o para isso.  Quando voc챗 tem dois commits 'r1' e 'r2' (nomeados de acordo com a sintaxe explicada em ESPECIFICANDO REVIS횛ES acima), voc챗 pode solicitar os commits que sejam acess챠veis atra챕s do 'r2' excluindo aqueles que podem ser acessados atrav챕s do 'r1' pelo '{caret}r1 r2' e podem ser escritos como 'r1..r2'."
 
 #. type: Labeled list
-#: en/revisions.txt:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr "A nota챌찾o da diferen챌a sim챕trica '...' (tr챗s pontos)"
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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 "Uma nota챌찾o semelhante 'r1\\...r2' 챕 chamada de uma diferen챌a sim챕trica de 'r1' e 'r2' sendo definida como 'r1 r2 --not $(git merge-base --all r1 r2)'.  횋 o conjunto dos commits que s찾o acess챠veis a partir do 'r1' (lado esquerdo) ou 'r2' (lado direito), por챕m, n찾o de ambos."
 
 #. type: Plain text
-#: en/revisions.txt:296
+#: en/revisions.txt:299
 #, 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 "Nestas duas nota챌천es abreviadas, 챕 poss챠vel omitir uma extremidade e deix찼-la como predefinido no `HEAD`.  Como por exemplo, 'origin..' 챕 uma abrevia챌찾o de 'origin..HEAD' e pergunta \"O que eu fiz desde que peguei a bifurca챌찾o no ramo de origem?\" Da mesma forma, '..origin' 챕 uma abrevia챌찾o de 'HEAD..origin' e pergunta \"O que a origem fez desde que eu as peguei?\" Observe que '..' significaria 'HEAD..HEAD', que 챕 um intervalo vazio acess챠vel e inacess챠vel a partir do `HEAD`."
 
+#. type: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, fuzzy, no-wrap, priority:100
+#| msgid "    o ---------- o\n"
+msgid "    ---A---B---o---o---C---D\n"
+msgstr "    o ---------- o\n"
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr "Outras <rev>{caret} Nota챌천es Abreviadas dos pais"
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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 "Existem tr챗s outras abrevia챌천es, particularmente 첬teis para a mesclagem dos commits, para nomear um conjunto formado por um commit e o seu pai principal."
 
 #. type: Plain text
-#: en/revisions.txt:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr "A nota챌찾o 'r1{caret}@' todos os pais do 'r1'."
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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 "A nota챌찾o 'r1{caret}!' (cursor) inclui o commit 'r1', mas exclui todos as suas origens.  Por si s처, essa nota챌찾o denota o 첬nico commit 'r1'."
 
 #. type: Plain text
-#: en/revisions.txt:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr "A nota챌찾o '<rev>{caret}-[<n>]' inclu챠 '<rev>' por챕m exclu챠 o '<n>챕simo' pai (ou seja, 챕 uma abrevia챌찾o para '<rev>{caret}<n>..<rev>'), com '<n>' = 1 caso n찾o seja informado. Geralmente 챕 첬til para a mesclagem dos commits onde 챕 poss챠vel passar '<commit>{caret}-' para obter todos os commits do ramoq que foi mesclado na mesclagem do commit '<commit>' (incluindo o pr처prio '<commit>')."
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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 "Embora '<rev>{caret}<n>' fosse sobre a especifica챌찾o do pai de um 첬nico commit, estas tr챗s nota챌천es tamb챕m consideram os seus pais. Como por exemplo, voc챗 pode dizer 'HEAD{caret}2{caret}@', contudo n찾o poder찼 dizer 'HEAD{caret}@{caret}2'."
 
 #. type: Title -
-#: en/revisions.txt:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr "Resumo do Intervalo da Revis찾o"
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr "'<rev>'"
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr "Inclua os commits que s찾o acess챠veis atrav챕s do <ref> (ou seja, <rev> e seus ancestrais)."
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr "'{caret}<rev>'"
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr "Exclua os commits que estejam acess챠veis a partir de `<rev>` (<rev> e os seus ancestrais por exemplo)."
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr "'<rev1>..<rev2>'"
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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 "Inclua os commits acess챠veis a partir do <rev2>, por챕m exclua aquelas acess챠veis a partir do <rev1>.  Quando <rev1> ou <rev2> for omitido, a predefini챌찾o retorna para `HEAD`."
 
 #. type: Labeled list
-#: en/revisions.txt:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr "'<rev1>\\...<rev2>'"
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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 "Inclu챠 os commits que sejam acess챠veis seja de <rev1> ou <rev2> por챕m exclua aqueles que sejam acess챠veis de ambos.  Quando <rev1> ou <rev2> for omitido, a predefini챌찾o retorna para `HEAD`."
 
 #. type: Labeled list
-#: en/revisions.txt:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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 "Um sufixo '{caret}' seguido por um sinal de arroba 챕 o mesmo que listar todas as origens de '<rev>' (ou seja, incluir qualquer coisa acess챠vel das suas origens, mas n찾o o pr처prio commit)."
 
 #. type: Labeled list
-#: en/revisions.txt:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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 "Um sufixo '{caret}' seguido de um ponto de exclama챌찾o 챕 o mesmo que fazer um commit '<rev>' e em seguida, todos as suas origens prefixam com '{caret}' para exclu챠-los (assim como seus ancestrais)."
 
 #. type: Labeled list
-#: en/revisions.txt:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr "횋 o equivalente a '<rev>{caret}<n>..<rev>', with '<n>' = 1 caso nenhum seja informado."
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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 "Aqui est찾o alguns exemplos utilizando a ilustra챌찾o Loeliger acima, com cada etapa da expans찾o e da sele챌찾o da nota챌찾o cuidadosamente explicitada:"
 
 #. type: delimited block .
-#: en/revisions.txt:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -66880,8 +67089,9 @@ msgstr "A forma '--filter=object:type=(tag|commit|tree|blob)' omite todo os obje
 
 #. type: Plain text
 #: en/rev-list-options.txt:902
-#, 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."
+#, fuzzy, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr "O formul찼rio '--filter=sparse:oid=<blob-ish>' usa uma especifica챌찾o de verifica챌찾o esparsa contida na bolha (ou express찾o bolha) '<blob-ish>' para omitir as bolhas que n찾o seriam necess찼rias em uma verifica챌찾o esparsa nas refer챗ncias solicitadas."
 
 #. type: Plain text
@@ -67142,56 +67352,81 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr "Exiba o conte첬do dos commits em formato bruto; cada registro 챕 separado por um caractere `NUL`."
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, fuzzy, priority:260
+#| msgid "Overrides a previous `--no-walk`."
+msgid "Overrides a previous `--no-commit-header`."
+msgstr "Substitui um `--no-walk` anterior."
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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 "Imprima tamb챕m os pais do commit (no formato \"commit parent...\").  Tamb챕m permite reescrever os pais, consulte 'Simplifica챌찾o do Hist처rico' acima."
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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 "Imprima tamb챕m os filhos do commit (no formato \"commit child...\").  Tamb챕m permite reescrever os pais, consulte 'Simplifica챌찾o do Hist처rico' acima."
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr "Exiba a data e hora do commit em formato bruto."
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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 "Marque de que lado da diferen챌a sim챕trica de onde um commit seja acess챠vel.  As confirma챌천es do lado esquerdo s찾o prefixadas com `<` e as da direita com `>`.  Caso combinemos com `--boundary`, estes commits s찾o prefixados com `-`."
 
 #. type: Plain text
-#: en/rev-list-options.txt:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr "Por exemplo, caso tenha essa topologia:"
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -67207,19 +67442,19 @@ msgstr ""
 "\t o---x---a---a  branch A\n"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr "voc챗 obter찼 uma sa챠da como essa:"
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
 msgstr "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -67237,43 +67472,43 @@ msgstr ""
 "\t-xxxxxxx... 1쨘 no a\n"
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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 "Desenhe uma representa챌찾o gr찼fica com base no texto do hist처rico de consolida챌찾o no lado esquerdo da sa챠da.  Pode fazer com que as linhas extras sejam impressas entre os commits, para que o hist처rico do grafo seja desenhado de forma correta.  N찾o pode ser combinado com `--no-walk`."
 
 #. type: Plain text
-#: en/rev-list-options.txt:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr "Permite a reescrita dos pais, consulte 'Simplifica챌찾o do Hist처rico' acima."
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, priority:260
 msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
 msgstr "횋 predefinido que seja impl챠cito o uso da op챌찾o `--topo-order`, por챕m a op챌찾o `--date-order` tamb챕m possa ser utilizada."
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr "--show-linear-break[=<barreira>]"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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 "Quando a op챌찾o `--graph` n찾o 챕 utilizado, todas as ramifica챌천es do hist처rico s찾o achatadas, o que dificulta a visualiza챌찾o onde dois commits consecutivos n찾o perten챌am em um ramo linear. Neste caso, esta op챌찾o coloca uma barreira entre eles. Caso `<barreira>` seja utilizado, 챕 a string que ser찼 exibida em vez do que estiver predefinido."
 
 #. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1147
 #, 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 "Imprima um n첬mero informando quantos commits teriam sido listados e suprima todas as outras sa챠das.  Quando usado em conjunto com a op챌찾o `--left-right`, imprima as contagens dos commits esquerdo e direito, separados por uma aba. Quando usado junto com a op챌찾o `--cherry-mark`, omita os commits equivalentes dos patches destas contagens e imprima a contagem para os commits equivalentes separados por uma aba."
@@ -69940,6 +70175,22 @@ msgstr "[[[8]]] https://www.kernel.org/pub/software/scm/git/docs/git-bisect.html
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 
+#~ 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 "As op챌천es `-M` e `-C` requerem um tempo de processamento O(n^2) em que n 챕 a quantidade de poss챠veis alvos para renomea챌천es/c처pia.  Esta op챌찾o impede que a detec챌찾o da a챌찾o de renomear/c처pia seja executada se a quantidade dos alvos a serem renomeados/copiados exceda o a quantidade usada."
+
+#~ msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+#~ msgstr "Utilize o arquivo de configura챌찾o informado em vez daquele especificado por GIT_CONFIG."
+
+#~ 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 "Estas regras podem ser substitu챠das atrav챕s da linha de comando ou atrav챕s das vari찼veis de ambiente. As op챌천es `--global`, `--system` e `--worktree` limitar찾o o arquivo utilizado ao arquivo global, em todo o sistema ou por 찼rvore de trabalho, respectivamente.  A vari찼vel de ambiente `GIT_CONFIG` environment variable has a similar effecttem um efeito similar, por챕m 챕 poss챠vel definir um nome do arquivo caso queira."
+
+#~ 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 "Pegue a configura챌찾o do arquivo informado em vez de .git/config. Usar a op챌찾o \"--global\" for챌a isso para ~/.gitconfig. Usar a op챌찾o \"--system\" for챌a isso para $(prefixo)/etc/gitconfig."
+
+#, ignore-ellipsis, no-wrap
+#~ msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+#~ msgstr "'git diff' [<op챌천es>] <commit> [--] [<caminho>...]"
+
 #, no-wrap
 #~ msgid "--no-diff-merges:"
 #~ msgstr "--no-diff-merges:"
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index cc5c0ca65414b37bfa53720dcdddedc284b05ea9..56e6b8bfdedc413f03b02a4df69ae3f8b74e01a9 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Git Documentation\n"
-"POT-Creation-Date: 2021-05-17 17:03+0200\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
 "PO-Revision-Date: 2020-02-08 19:43+0100\n"
 "Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
 "Language-Team: pt_PT\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -76,7 +76,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 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:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -136,7 +136,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2816,7 +2816,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2850,139 +2850,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3866,13 +3866,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3959,33 +3959,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -3994,7 +3994,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4493,7 +4493,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4525,7 +4525,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4752,7 +4752,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4764,7 +4764,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5118,79 +5118,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5199,428 +5199,428 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, no-wrap, priority:280
 msgid "--skip-to=<file>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, no-wrap, priority:280
 msgid "--rotate-to=<file>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5758,55 +5758,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5814,397 +5832,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6287,13 +6305,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr ""
@@ -6323,7 +6341,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6353,13 +6371,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6533,31 +6551,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr ""
@@ -6569,7 +6587,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6923,7 +6941,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6935,13 +6953,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7379,7 +7397,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7591,7 +7609,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7891,7 +7909,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8161,7 +8179,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8299,7 +8317,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12263,7 +12281,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12647,7 +12665,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14069,7 +14087,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14862,7 +14880,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14968,7 +14986,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15098,7 +15116,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15110,7 +15128,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15821,557 +15839,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16434,14 +16446,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16452,7 +16476,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16462,7 +16486,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16472,7 +16496,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16482,7 +16506,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16494,157 +16518,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16654,13 +16678,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16673,19 +16697,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16693,13 +16717,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19335,103 +19359,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19439,25 +19463,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19465,13 +19489,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19479,7 +19503,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19487,13 +19511,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19501,37 +19525,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19561,19 +19585,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20161,7 +20185,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20343,13 +20367,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20358,110 +20382,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20470,31 +20500,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20503,31 +20533,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20536,31 +20566,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20569,31 +20599,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20601,19 +20631,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27815,7 +27845,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31252,373 +31282,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, fuzzy, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr "linkgit:git-shortlog[1]"
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36725,7 +36755,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36741,7 +36771,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36945,7 +36975,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -36981,7 +37011,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37090,7 +37120,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37646,7 +37676,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38130,7 +38160,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43272,115 +43302,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44453,7 +44483,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46837,521 +46867,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47361,151 +47409,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47516,25 +47564,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47543,19 +47591,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49202,253 +49250,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49457,31 +49505,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49493,13 +49541,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49514,13 +49562,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49532,19 +49580,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49559,19 +49607,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49580,7 +49628,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51679,7 +51727,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57791,7 +57839,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58098,7 +58146,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -58291,7 +58339,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58769,7 +58817,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62449,194 +62497,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64214,7 +64298,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64475,56 +64559,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64535,19 +64643,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64559,43 +64667,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.ro.po b/po/documentation.ro.po
index a2cf5b1663bc98109752b9733c99ec00537f2517..dccc954565728d990f5f69578be101277720750a 100644
--- a/po/documentation.ro.po
+++ b/po/documentation.ro.po
@@ -4,10 +4,22 @@
 # Jean-No챘l Avila <jn.avila@free.fr>, 2021.
 #
 msgid ""
-msgstr "Project-Id-Version: git-manpages-l 10n\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-05-17 17:03+0200\nPO-Revision-Date: 2021-08-02 15:34+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: Romanian <translation-team-ro@lists.sourceforge.net>\nLanguage: ro\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\nX-Generator: Weblate 4.8-dev\n"
+msgstr ""
+"Project-Id-Version: git-manpages-l 10n\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
+"PO-Revision-Date: 2021-07-24 19:34+0000\n"
+"Last-Translator: Simona Iacob <s@zp1.net>\n"
+"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n"
+"X-Generator: Weblate 4.7.2-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -67,7 +79,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -79,7 +91,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 msgid "-t"
 msgstr "-t"
@@ -115,7 +127,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -127,7 +139,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2806,7 +2818,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2840,139 +2852,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3167,7 +3179,13 @@ msgid ""
 "create         :000000 100644 0000000 1234567 A file4\n"
 "delete         :100644 000000 1234567 0000000 D file5\n"
 "unmerged       :000000 000000 0000000 0000000 U file6\n"
-msgstr "in-place edit  :100644 100644 bcd1234 0123456 M file0\ncopy-edit      :100644 100644 abcd123 1234567 C68 file1 file2\nrename-edit    :100644 100644 abcd123 1234567 R86 file1 file3\ncreate         :000000 100644 0000000 1234567 A file4\ndelete         :100644 000000 1234567 0000000 D file5\nunmerged       :000000 000000 0000000 0000000 U file6\n"
+msgstr ""
+"in-place edit  :100644 100644 bcd1234 0123456 M file0\n"
+"copy-edit      :100644 100644 abcd123 1234567 C68 file1 file2\n"
+"rename-edit    :100644 100644 abcd123 1234567 R86 file1 file3\n"
+"create         :000000 100644 0000000 1234567 A file4\n"
+"delete         :100644 000000 1234567 0000000 D file5\n"
+"unmerged       :000000 000000 0000000 0000000 U file6\n"
 
 #. type: Plain text
 #: en/diff-format.txt:38
@@ -3392,7 +3410,10 @@ msgid ""
 "::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\n"
 "::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tbar.sh\n"
 "::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tphooey.c\n"
-msgstr "::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\n::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tbar.sh\n::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tphooey.c\n"
+msgstr ""
+"::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\n"
+"::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tbar.sh\n"
+"::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tphooey.c\n"
 
 #. type: Plain text
 #: en/diff-format.txt:113
@@ -3407,7 +3428,10 @@ msgid ""
 "::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\tdesc.c\tdesc.c\n"
 "::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tfoo.sh\tbar.sh\tbar.sh\n"
 "::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tfooey.c\tfuey.c\tphooey.c\n"
-msgstr "::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\tdesc.c\tdesc.c\n::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tfoo.sh\tbar.sh\tbar.sh\n::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tfooey.c\tfuey.c\tphooey.c\n"
+msgstr ""
+"::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\tdesc.c\tdesc.c\n"
+"::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tfoo.sh\tbar.sh\tbar.sh\n"
+"::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tfooey.c\tfuey.c\tphooey.c\n"
 
 #. type: Plain text
 #: en/diff-format.txt:122
@@ -3451,7 +3475,9 @@ msgstr "Op�iunea `--numstat` ofer훱 informa�iile din diffstat(1), dar este con
 msgid ""
 "1\t2\tREADME\n"
 "3\t1\tarch/{i386 => x86}/Makefile\n"
-msgstr "1\t2\tREADME\n3\t1\tarch/{i386 => x86}/Makefile\n"
+msgstr ""
+"1\t2\tREADME\n"
+"3\t1\tarch/{i386 => x86}/Makefile\n"
 
 #. type: Plain text
 #: en/diff-format.txt:154
@@ -3501,7 +3527,9 @@ msgstr "Atunci c창nd op�iunea de ie�ire `-z` este 챤n vigoare, ie�irea este f
 msgid ""
 "1\t2\tREADME NUL\n"
 "3\t1\tNUL arch/i386/Makefile NUL arch/x86/Makefile NUL\n"
-msgstr "1\t2\tREADME NUL\n3\t1\tNUL arch/i386/Makefile NUL arch/x86/Makefile NUL\n"
+msgstr ""
+"1\t2\tREADME NUL\n"
+"3\t1\tNUL arch/i386/Makefile NUL arch/x86/Makefile NUL\n"
 
 #. type: Plain text
 #: en/diff-format.txt:170
@@ -3602,7 +3630,18 @@ msgid ""
 "similarity index <number>\n"
 "dissimilarity index <number>\n"
 "index <hash>..<hash> <mode>\n"
-msgstr "modul vechi <modul>\nmodul nou <modul>\nmod fi�ier �ters <mode>\nnoul mod de fi�ier <mode>\ncopie din <path>\ncopie din <path>\nredenumire din <path>\nredenume�te 챤n <path>\nindice de similaritate <num훱r>\nindice de disimilaritate <num훱r>\nindex <hash>..<hash> <mode>\n"
+msgstr ""
+"modul vechi <modul>\n"
+"modul nou <modul>\n"
+"mod fi�ier �ters <mode>\n"
+"noul mod de fi�ier <mode>\n"
+"copie din <path>\n"
+"copie din <path>\n"
+"redenumire din <path>\n"
+"redenume�te 챤n <path>\n"
+"indice de similaritate <num훱r>\n"
+"indice de disimilaritate <num훱r>\n"
+"index <hash>..<hash> <mode>\n"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:47
@@ -3650,7 +3689,13 @@ msgid ""
 "diff --git a/b b/a\n"
 "rename from b\n"
 "rename to a\n"
-msgstr "diff --git a/a b/b\nredenumi�i din a\nredenume�te 챤n b\ndiff --git a/b b/a\nredenumire din b\nredenumire 챤n a\n"
+msgstr ""
+"diff --git a/a b/b\n"
+"redenumi�i din a\n"
+"redenume�te 챤n b\n"
+"diff --git a/b b/a\n"
+"redenumire din b\n"
+"redenumire 챤n a\n"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:81
@@ -3687,7 +3732,14 @@ msgid ""
 "@@@ -98,20 -98,12 +98,20 @@@\n"
 "\treturn (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;\n"
 "  }\n"
-msgstr "diff --combined describe.c\nindex fabadb8,cc95eb0..4866510\n--- a/describe.c\n+++ b/describe.c\n@@@ -98,20 -98,12 +98,20 @@@\n\treturn (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;\n  }\n"
+msgstr ""
+"diff --combined describe.c\n"
+"index fabadb8,cc95eb0..4866510\n"
+"--- a/describe.c\n"
+"+++ b/describe.c\n"
+"@@@ -98,20 -98,12 +98,20 @@@\n"
+"\treturn (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;\n"
+"  }\n"
 
 #. type: delimited block -
 #: en/diff-generate-patch.txt:113
@@ -3702,7 +3754,16 @@ msgid ""
 "\tstruct commit_list *list;\n"
 "\tstatic int initialized = 0;\n"
 "\tstruct commit_name *n;\n"
-msgstr "- static void describe(char *arg)\n -static void describe(struct commit *cmit, int last_one)\n++static void describe(char *arg, int last_one)\n  {\n +\tunsigned char sha1[20];\n +\tstruct commit *cmit;\n\tstruct commit_list *list;\n\tstatic int initialized = 0;\n\tstruct commit_name *n;\n"
+msgstr ""
+"- static void describe(char *arg)\n"
+" -static void describe(struct commit *cmit, int last_one)\n"
+"++static void describe(char *arg, int last_one)\n"
+"  {\n"
+" +\tunsigned char sha1[20];\n"
+" +\tstruct commit *cmit;\n"
+"\tstruct commit_list *list;\n"
+"\tstatic int initialized = 0;\n"
+"\tstruct commit_name *n;\n"
 
 #. type: delimited block -
 #: en/diff-generate-patch.txt:123
@@ -3717,7 +3778,16 @@ msgid ""
 "\tif (!initialized) {\n"
 "\t\tinitialized = 1;\n"
 "\t\tfor_each_ref(get_name);\n"
-msgstr " +\tif (get_sha1(arg, sha1) < 0)\n +\t\tusage(describe_usage);\n +\tcmit = lookup_commit_reference(sha1);\n +\tif (!cmit)\n +\t\tusage(describe_usage);\n +\n\tif (!initialized) {\n\t\tinitialized = 1;\n\t\tfor_each_ref(get_name);\n"
+msgstr ""
+" +\tif (get_sha1(arg, sha1) < 0)\n"
+" +\t\tusage(describe_usage);\n"
+" +\tcmit = lookup_commit_reference(sha1);\n"
+" +\tif (!cmit)\n"
+" +\t\tusage(describe_usage);\n"
+" +\n"
+"\tif (!initialized) {\n"
+"\t\tinitialized = 1;\n"
+"\t\tfor_each_ref(get_name);\n"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:127
@@ -3757,7 +3827,11 @@ msgid ""
 "mode <mode>,<mode>..<mode>\n"
 "new file mode <mode>\n"
 "deleted file mode <mode>,<mode>\n"
-msgstr "index <hash>,<hash>..<hash>\nmode <mode>,<mode>..<mode>\nnoul mod de fi�ier <mode>\nmod fi�ier �ters <mode>,<mode>,<mode>\n"
+msgstr ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>..<mode>\n"
+"noul mod de fi�ier <mode>\n"
+"mod fi�ier �ters <mode>,<mode>,<mode>\n"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:147
@@ -3856,13 +3930,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr "Genereaz훱 patch-uri simple f훱r훱 statistici diff."
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3946,39 +4020,41 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
-#, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+#: en/diff-options.txt:55
+#, fuzzy, priority:280
+#| msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr "Aceast훱 op�iune face ca ie�irea diff pentru comenzi de fuziune s훱 fie afi�at훱 챤n formatul implicit. `-m` va produce ie�irea numai dac훱 se d훱 �i `-p`. Formatul implicit poate fi modificat cu ajutorul parametrului de configurare `log.diffMerges`, a c훱rui valoare implicit훱 este `separate`."
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, no-wrap, priority:280
 msgid "--diff-merges=first-parent"
 msgstr "--diff-merges=first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, no-wrap, priority:280
 msgid "--diff-merges=1"
 msgstr "--diff-merges=1"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr "Aceast훱 op�iune face ca modific훱rile de fuziune s훱 afi�eze diferen�a complet훱 numai 챤n raport cu primul ascendent."
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, no-wrap, priority:280
 msgid "--diff-merges=separate"
 msgstr "--diff-merges=separate"
 
 #. type: Plain text
 #: en/diff-options.txt:66
-#, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+#, fuzzy, priority:280
+#| msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr "Acest lucru face ca modific훱rile de fuziune s훱 afi�eze toate diferen�ele fa�훱 de fiecare dintre p훱rin�i. Pentru fiecare ascendent se genereaz훱 o intrare separat훱 챤n jurnal �i o diferen�훱 separat훱."
 
 #. type: Labeled list
@@ -4122,7 +4198,12 @@ msgid ""
 "\tlinkgit:git-diff[1]. This is different from showing the log\n"
 "\titself in raw format, which you can achieve with\n"
 "\t`--format=raw`.\n"
-msgstr "\tPentru fiecare confirmare, afi�a�i un rezumat al modific훱rilor folosind diff brut\n\tformat. Consulta�i sec�iunea \"FORMAT DE Ie�IRE RAW\" din\n\tlinkgit:git-diff[1]. Acest lucru este diferit de afi�area jurnalului\n\t챤n sine 챤n format brut, ceea ce se poate realiza cu\n\t`--format=raw`.\n"
+msgstr ""
+"\tPentru fiecare confirmare, afi�a�i un rezumat al modific훱rilor folosind diff brut\n"
+"\tformat. Consulta�i sec�iunea \"FORMAT DE Ie�IRE RAW\" din\n"
+"\tlinkgit:git-diff[1]. Acest lucru este diferit de afi�area jurnalului\n"
+"\t챤n sine 챤n format brut, ceea ce se poate realiza cu\n"
+"\t`--format=raw`.\n"
 
 #. type: Labeled list
 #: en/diff-options.txt:130
@@ -4473,7 +4554,7 @@ msgid "Synonym for `-p --stat`."
 msgstr "Sinonim pentru `-p --stat`."
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4496,7 +4577,9 @@ msgstr "De asemenea, 챤n cazul 챤n care a fost dat `--raw` sau `--numstat`, nu s
 msgid ""
 "\tWhen `--raw`, `--numstat`, `--name-only` or `--name-status` has been\n"
 "\tgiven, do not munge pathnames and use NULs as output field terminators.\n"
-msgstr "\tAtunci c창nd `--raw`, `--numstat`, `--name-only` sau `--name-status` a fost\n\tnu se utilizeaz훱 nume de c훱i de acces �i se folosesc NUL-uri ca terminatori ai c창mpurilor de ie�ire.\n"
+msgstr ""
+"\tAtunci c창nd `--raw`, `--numstat`, `--name-only` sau `--name-status` a fost\n"
+"\tnu se utilizeaz훱 nume de c훱i de acces �i se folosesc NUL-uri ca terminatori ai c창mpurilor de ie�ire.\n"
 
 #. type: Plain text
 #: en/diff-options.txt:301 en/git-apply.txt:123
@@ -4505,7 +4588,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr "F훱r훱 aceast훱 op�iune, numele c훱ilor de acces cu caractere \"neobi�nuite\" sunt citate a�a cum se explic훱 pentru variabila de configurare `core.quotePath` (vezi linkgit:git-config[1])."
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4732,7 +4815,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4744,7 +4827,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5098,79 +5181,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5179,427 +5262,427 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, no-wrap, priority:280
 msgid "--skip-to=<file>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, no-wrap, priority:280
 msgid "--rotate-to=<file>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, no-wrap, priority:280
 msgid "--ignore-matching-lines=<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5737,55 +5820,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5793,397 +5894,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr "--upload-pack <upload-pack>"
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "Po�i s훱 fii vorb훱re�."
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<option>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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 "Transmite serverului �irul de caractere dat atunci c창nd se comunic훱 folosind versiunea 2 a protocolului.  �irul dat nu trebuie s훱 con�in훱 un caracter NUL sau LF.  Gestionarea de c훱tre server a op�iunilor serverului, inclusiv a celor necunoscute, este specific훱 serverului.  Atunci c창nd sunt date mai multe `--server-option=<option>`, toate sunt trimise celeilalte p훱r�i 챤n ordinea listat훱 pe linia de comand훱."
 
 #. type: Labeled list
-#: en/fetch-options.txt:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6221,7 +6322,12 @@ msgid ""
 "\t  [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
 "\t  [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "\t  [--] [<pathspec>...]\n"
-msgstr "'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\t  [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n\t  [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n\t  [--] [<pathspec>...]\n"
+msgstr ""
+"'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"
+"\t  [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
+"\t  [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t  [--] [<pathspec>...]\n"
 
 #. type: Title -
 #: en/git-add.txt:18 en/git-am.txt:23 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-bugreport.txt:14 en/git-bundle.txt:19 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:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 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:28 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:20 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:37 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:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 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-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-range-diff.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:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 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:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 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:32 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:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
@@ -6266,13 +6372,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "V훱 rug훱m s훱 consulta�i linkgit:git-commit[1] pentru modalit훱�i alternative de a ad훱uga con�inut la un commit."
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OP�IUNI"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr "<pathspec>..."
@@ -6302,7 +6408,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr "Permite ad훱ugarea de fi�iere altfel ignorate."
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6332,13 +6438,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr "Acest lucru ruleaz훱 efectiv `add --interactive`, dar ocole�te meniul ini�ial de comenzi �i trece direct la subcomanda `patch`.  Pentru detalii, consulta�i ``Modul interactiv''."
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6512,31 +6618,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr "Suprascrie�i bitul executabil al fi�ierelor ad훱ugate.  Bitul executabil este modificat doar 챤n index, fi�ierele de pe disc r훱m창n neschimbate."
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr "Pathspec este transmis 챤n `<file>` 챤n loc de argetele din linia de comand훱. Dac훱 `<file>` este exact `-`, se utilizeaz훱 intrarea standard. Elementele Pathspec sunt separate prin LF sau CR/LF. Elementele Pathspec pot fi citate a�a cum se explic훱 pentru variabila de configurare `core.quotePath` (a se vedea linkgit:git-config[1]). A se vedea �i `--pathspec-file-nul` �i `--literal-pathspecs` global."
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr "Are sens numai cu `--pathspec-from-file`. Elementele Pathspec sunt separate prin caracterul NUL, iar toate celelalte caractere sunt luate 챤n considerare 챤n mod literal (inclusiv liniile de 챤nceput �i ghilimelele)."
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr "\\--"
@@ -6548,7 +6654,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr "Aceast훱 op�iune poate fi utilizat훱 pentru a separa op�iunile liniei de comand훱 de lista de fi�iere (util atunci c창nd numele fi�ierelor pot fi confundate cu op�iunile liniei de comand훱)."
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "EXEMPLE"
@@ -6615,7 +6721,11 @@ msgid ""
 "      1: status       2: update       3: revert       4: add untracked\n"
 "      5: patch        6: diff         7: quit         8: help\n"
 "    What now> 1\n"
-msgstr "    *** Commands ***\n      1: status       2: update       3: revert       4: add untracked\n      5: patch        6: diff         7: quit         8: help\n    What now> 1\n"
+msgstr ""
+"    *** Commands ***\n"
+"      1: status       2: update       3: revert       4: add untracked\n"
+"      5: patch        6: diff         7: quit         8: help\n"
+"    What now> 1\n"
 
 #. type: Plain text
 #: en/git-add.txt:254
@@ -6648,7 +6758,10 @@ msgid ""
 "              staged     unstaged path\n"
 "     1:       binary      nothing foo.png\n"
 "     2:     +403/-35        +1/-1 git-add--interactive.perl\n"
-msgstr "              staged     unstaged path\n     1:       binary      nothing foo.png\n     2:     +403/-35        +1/-1 git-add--interactive.perl\n"
+msgstr ""
+"              staged     unstaged path\n"
+"     1:       binary      nothing foo.png\n"
+"     2:     +403/-35        +1/-1 git-add--interactive.perl\n"
 
 #. type: Plain text
 #: en/git-add.txt:280
@@ -6681,7 +6794,10 @@ msgid ""
 "           staged     unstaged path\n"
 "  1:       binary      nothing foo.png\n"
 "* 2:     +403/-35        +1/-1 git-add--interactive.perl\n"
-msgstr "           staged     unstaged path\n  1:       binary      nothing foo.png\n* 2:     +403/-35        +1/-1 git-add--interactive.perl\n"
+msgstr ""
+"           staged     unstaged path\n"
+"  1:       binary      nothing foo.png\n"
+"* 2:     +403/-35        +1/-1 git-add--interactive.perl\n"
 
 #. type: Plain text
 #: en/git-add.txt:302
@@ -6755,7 +6871,21 @@ msgid ""
 "s - split the current hunk into smaller hunks\n"
 "e - manually edit the current hunk\n"
 "? - print help\n"
-msgstr "y - pune 챤n scen훱 aceast훱 bucat훱\nn - nu pune�i 챤n scen훱 aceast훱 bucat훱\nq - renun�훱; nu pune 챤n scen훱 aceast훱 bucat훱 sau oricare dintre cele r훱mase\na - pune 챤n scen훱 aceast훱 bucat훱 �i toate buc훱�ile ulterioare din fi�ier\nd - nu pune 챤n scen훱 aceast훱 bucat훱 �i nici una dintre buc훱�ile ulterioare din fi�ier\ng - selecteaz훱 o bucat훱 la care s훱 treac훱\n/ - caut훱 o bucat훱 care se potrive�te cu regex-ul dat\nj - las훱 aceast훱 bucat훱 nehot훱r창t훱, vezi urm훱toarea bucat훱 nehot훱r창t훱\nJ - las훱 acest hunk nehot훱r창t, vezi urm훱torul hunk\nk - las훱 aceast훱 bucat훱 nehot훱r창t훱, vezi bucat훱 nehot훱r창t훱 anterioar훱\nK - las훱 aceast훱 bucat훱 nehot훱r창t훱, vezi bucat훱 anterioar훱\ns - 챤mparte bucata curent훱 챤n buc훱�i mai mici\ne - editeaz훱 manual hunk-ul curent\n? - tip훱re�te ajutorul\n"
+msgstr ""
+"y - pune 챤n scen훱 aceast훱 bucat훱\n"
+"n - nu pune�i 챤n scen훱 aceast훱 bucat훱\n"
+"q - renun�훱; nu pune 챤n scen훱 aceast훱 bucat훱 sau oricare dintre cele r훱mase\n"
+"a - pune 챤n scen훱 aceast훱 bucat훱 �i toate buc훱�ile ulterioare din fi�ier\n"
+"d - nu pune 챤n scen훱 aceast훱 bucat훱 �i nici una dintre buc훱�ile ulterioare din fi�ier\n"
+"g - selecteaz훱 o bucat훱 la care s훱 treac훱\n"
+"/ - caut훱 o bucat훱 care se potrive�te cu regex-ul dat\n"
+"j - las훱 aceast훱 bucat훱 nehot훱r창t훱, vezi urm훱toarea bucat훱 nehot훱r창t훱\n"
+"J - las훱 acest hunk nehot훱r창t, vezi urm훱torul hunk\n"
+"k - las훱 aceast훱 bucat훱 nehot훱r창t훱, vezi bucat훱 nehot훱r창t훱 anterioar훱\n"
+"K - las훱 aceast훱 bucat훱 nehot훱r창t훱, vezi bucat훱 anterioar훱\n"
+"s - 챤mparte bucata curent훱 챤n buc훱�i mai mici\n"
+"e - editeaz훱 manual hunk-ul curent\n"
+"? - tip훱re�te ajutorul\n"
 
 #. type: Plain text
 #: en/git-add.txt:346
@@ -6902,7 +7032,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr "modificarea con�inutului liniilor de context sau de eliminare"
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "VEZI �I"
@@ -6914,13 +7044,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "Parte a suitei linkgit:git[1]"
@@ -7357,7 +7487,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7569,7 +7699,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7869,7 +7999,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8139,7 +8269,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8277,7 +8407,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12237,7 +12367,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12621,7 +12751,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14022,7 +14152,16 @@ msgid ""
 "\t  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
 "\t  [--filter=<filter>] [--] <repository>\n"
 "\t  [<directory>]\n"
-msgstr "'git clone' [--template=<template_directory>]\n\t  [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n\t  [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]\n\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  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n\t  [--filter=<filter>] [--] <repository>\n\t  [<directory>]\n"
+msgstr ""
+"'git clone' [--template=<template_directory>]\n"
+"\t  [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
+"\t  [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]\n"
+"\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  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
+"\t  [--filter=<filter>] [--] <repository>\n"
+"\t  [<directory>]\n"
 
 #. type: Plain text
 #: en/git-clone.txt:30
@@ -14043,7 +14182,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr "Aceast훱 configura�ie implicit훱 este realizat훱 prin crearea de referin�e la capetele de bran�훱 la distan�훱 챤n `refs/remotes/origin` �i prin ini�ializarea variabilelor de configurare `remote.origin.url` �i `remote.origin.fetch`."
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14067,7 +14206,10 @@ msgid ""
 "*NOTE*: this operation can race with concurrent modification to the\n"
 "source repository, similar to running `cp -r src dst` while modifying\n"
 "`src`.\n"
-msgstr "*NOTA*: aceast훱 opera�iune se poate 챤ntrece cu modificarea concurent훱 a fi�ierului\ndepozitului surs훱, similar cu rularea `cp -r src dst` 챤n timp ce se modific훱\n`src`.\n"
+msgstr ""
+"*NOTA*: aceast훱 opera�iune se poate 챤ntrece cu modificarea concurent훱 a fi�ierului\n"
+"depozitului surs훱, similar cu rularea `cp -r src dst` 챤n timp ce se modific훱\n"
+"`src`.\n"
 
 #. type: Labeled list
 #: en/git-clone.txt:65
@@ -14106,7 +14248,16 @@ msgid ""
 "which automatically call `git maintenance run --auto`. (See\n"
 "linkgit:git-maintenance[1].) If these objects are removed and were referenced\n"
 "by the cloned repository, then the cloned repository will become corrupt.\n"
-msgstr "*NOTA*: aceasta este o opera�iune care poate fi periculoas훱; *nu* folosi�i\ndac훱 nu 챤n�elege�i ce face. Dac훱 v훱 clona�i\ndepozitul folosind aceast훱 op�iune �i apoi �terge�i ramuri (sau folosi�i orice\nalt훱 comand훱 Git care face ca orice comitere existent훱 s훱 nu mai aib훱 referin�훱) 챤n\ndepozit surs훱, este posibil ca unele obiecte s훱 nu mai aib훱 referin�e (sau s훱 fie suspendate).\nAceste obiecte pot fi eliminate prin opera�iuni Git normale (cum ar fi `git commit`)\ncare apeleaz훱 automat `git maintenance run --auto`. (A se vedea\nlinkgit:git-maintenance[1].) 횓n cazul 챤n care aceste obiecte sunt eliminate �i au fost men�ionate\nde c훱tre depozitul clonat, atunci depozitul clonat va deveni corupt.\n"
+msgstr ""
+"*NOTA*: aceasta este o opera�iune care poate fi periculoas훱; *nu* folosi�i\n"
+"dac훱 nu 챤n�elege�i ce face. Dac훱 v훱 clona�i\n"
+"depozitul folosind aceast훱 op�iune �i apoi �terge�i ramuri (sau folosi�i orice\n"
+"alt훱 comand훱 Git care face ca orice comitere existent훱 s훱 nu mai aib훱 referin�훱) 챤n\n"
+"depozit surs훱, este posibil ca unele obiecte s훱 nu mai aib훱 referin�e (sau s훱 fie suspendate).\n"
+"Aceste obiecte pot fi eliminate prin opera�iuni Git normale (cum ar fi `git commit`)\n"
+"care apeleaz훱 automat `git maintenance run --auto`. (A se vedea\n"
+"linkgit:git-maintenance[1].) 횓n cazul 챤n care aceste obiecte sunt eliminate �i au fost men�ionate\n"
+"de c훱tre depozitul clonat, atunci depozitul clonat va deveni corupt.\n"
 
 #. type: Plain text
 #: en/git-clone.txt:94
@@ -14138,7 +14289,9 @@ msgstr "횓n cazul 챤n care depozitul de referin�훱 se afl훱 pe calculatorul loc
 msgid ""
 "*NOTE*: see the NOTE for the `--shared` option, and also the\n"
 "`--dissociate` option.\n"
-msgstr "*NOTA*: a se vedea NOTA pentru op�iunea `--shared` �i, de asemenea, op�iunea\n`--dissociate`.\n"
+msgstr ""
+"*NOTA*: a se vedea NOTA pentru op�iunea `--shared` �i, de asemenea, op�iunea\n"
+"`--dissociate`.\n"
 
 #. type: Labeled list
 #: en/git-clone.txt:113 en/git-submodule.txt:403
@@ -14477,7 +14630,10 @@ msgid ""
 "$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n"
 "$ cd my-linux\n"
 "$ make\n"
-msgstr "$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n$ cd my-linux\n$ make\n"
+msgstr ""
+"$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n"
+"$ cd my-linux\n"
+"$ make\n"
 
 #. type: Plain text
 #: en/git-clone.txt:337
@@ -14492,7 +14648,10 @@ msgid ""
 "$ git clone -l -s -n . ../copy\n"
 "$ cd ../copy\n"
 "$ git show-branch\n"
-msgstr "$ git clone -l -s -n . ../copy\n$ cd ../copy\n$ git show-branch\n"
+msgstr ""
+"$ git clone -l -s -n . ../copy\n"
+"$ cd ../copy\n"
+"$ git show-branch\n"
 
 #. type: Plain text
 #: en/git-clone.txt:346
@@ -14508,7 +14667,11 @@ msgid ""
 "\tgit://git.kernel.org/pub/scm/.../linux.git \\\n"
 "\tmy-linux\n"
 "$ cd my-linux\n"
-msgstr "$ git clone --reference /git/linux.git \\\n\tgit://git.kernel.org/pub/scm/.../linux.git \\\n\tmy-linux\n$ cd my-linux\n"
+msgstr ""
+"$ git clone --reference /git/linux.git \\\n"
+"\tgit://git.kernel.org/pub/scm/.../linux.git \\\n"
+"\tmy-linux\n"
+"$ cd my-linux\n"
 
 #. type: Plain text
 #: en/git-clone.txt:356
@@ -14835,7 +14998,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14941,7 +15104,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15071,7 +15234,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15083,7 +15246,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15794,557 +15957,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16405,14 +16562,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16423,7 +16592,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16433,7 +16602,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16443,7 +16612,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16453,7 +16622,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16465,157 +16634,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16625,13 +16794,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16644,19 +16813,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16664,13 +16833,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19306,103 +19475,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19410,25 +19579,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19436,13 +19605,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19450,7 +19619,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19458,13 +19627,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19472,37 +19641,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19532,19 +19701,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20132,7 +20301,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20314,13 +20483,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20329,110 +20498,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20441,31 +20616,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20474,31 +20649,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20507,31 +20682,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20540,31 +20715,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20572,19 +20747,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, 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], linkgit:git-show[1]"
 msgstr ""
@@ -27781,7 +27956,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -29998,7 +30173,11 @@ msgid ""
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
 "\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
-msgstr "'git init' [-q | --quiet] [--bare] [--template=<directorul_�ablon>]]\n\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n\t  [-b <branch-name> | --initial-branch=<branch-name>]\n\t  [--shared[=<permissions>]]] [director]\n"
+msgstr ""
+"'git init' [-q | --quiet] [--bare] [--template=<directorul_�ablon>]]\n"
+"\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
+"\t  [--shared[=<permissions>]]] [director]\n"
 
 #. type: Plain text
 #: en/git-init.txt:26
@@ -30236,7 +30415,11 @@ msgid ""
 "$ git init      <1>\n"
 "$ git add .     <2>\n"
 "$ git commit    <3>\n"
-msgstr "$ cd /path/to/my/codebase\n$ git init      <1>\n$ git add .     <2>\n$ git commit    <3>\n"
+msgstr ""
+"$ cd /path/to/my/codebase\n"
+"$ git init      <1>\n"
+"$ git add .     <2>\n"
+"$ git commit    <3>\n"
 
 #. type: Plain text
 #: en/git-init.txt:166
@@ -31216,373 +31399,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36686,7 +36869,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36702,7 +36885,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36906,7 +37089,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -36942,7 +37125,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37051,7 +37234,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37607,7 +37790,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38091,7 +38274,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43225,115 +43408,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44405,7 +44588,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46788,521 +46971,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47312,151 +47513,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47467,25 +47668,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47494,19 +47695,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49152,253 +49353,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49407,31 +49608,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49443,13 +49644,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49464,13 +49665,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49482,19 +49683,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49509,19 +49710,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49530,7 +49731,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51629,7 +51830,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57738,7 +57939,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58045,7 +58246,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -58238,7 +58439,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58715,7 +58916,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62380,194 +62581,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64144,7 +64381,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64405,56 +64642,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64465,19 +64726,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64489,43 +64750,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
@@ -64904,7 +65165,9 @@ msgstr "Dac훱 exist훱 un num훱r mare de depozite la distan�훱 cu nume similare
 msgid ""
 "\t[url \"<actual url base>\"]\n"
 "\t\tinsteadOf = <other url base>\n"
-msgstr "\t[url \"<actual url base>\"]\n\t\tinsteadOf = <other url base>\n"
+msgstr ""
+"\t[url \"<actual url base>\"]\n"
+"\t\tinsteadOf = <other url base>\n"
 
 #. type: Plain text
 #: en/urls.txt:81 en/urls.txt:100
@@ -64919,7 +65182,10 @@ msgid ""
 "\t[url \"git://git.host.xz/\"]\n"
 "\t\tinsteadOf = host.xz:/path/to/\n"
 "\t\tinsteadOf = work:\n"
-msgstr "\t[url \"git://git.host.xz/\"]\n\t\tinsteadOf = host.xz:/path/to/\n\t\tinsteadOf = work:\n"
+msgstr ""
+"\t[url \"git://git.host.xz/\"]\n"
+"\t\tinsteadOf = host.xz:/path/to/\n"
+"\t\tinsteadOf = work:\n"
 
 #. type: Plain text
 #: en/urls.txt:90
@@ -64939,7 +65205,9 @@ msgstr "Dac훱 dori�i s훱 rescrie�i URL-urile doar pentru push, pute�i crea o
 msgid ""
 "\t[url \"<actual url base>\"]\n"
 "\t\tpushInsteadOf = <other url base>\n"
-msgstr "\t[url \"<actual url base>\"]\n\t\tpushInsteadOf = <other url base>\n"
+msgstr ""
+"\t[url \"<actual url base>\"]\n"
+"\t\tpushInsteadOf = <other url base>\n"
 
 #. type: delimited block -
 #: en/urls.txt:104
@@ -64947,7 +65215,9 @@ msgstr "\t[url \"<actual url base>\"]\n\t\tpushInsteadOf = <other url base>\n"
 msgid ""
 "\t[url \"ssh://example.org/\"]\n"
 "\t\tpushInsteadOf = git://example.org/\n"
-msgstr "\t[url \"ssh://example.org/\"]\n\t\tpushInsteadOf = git://example.org/\n"
+msgstr ""
+"\t[url \"ssh://example.org/\"]\n"
+"\t\tpushInsteadOf = git://example.org/\n"
 
 #. type: Plain text
 #: en/urls.txt:108
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 29ed7210dc0f969011f5940099b682674e640cfd..b8bcc9d119c01f0a1dea5f355db4bedd739abbec 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: 2021-05-17 17:03+0200\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
 "PO-Revision-Date: 2021-04-29 10:32+0000\n"
 "Last-Translator: fixxite <seofil@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Weblate 4.7-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -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:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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 "�棘克逵鈞�勻逵�� 極棘剋戟�筠 SHA-1 (�棘 �劇棘剋�逵戟龜�: 棘�克剋��筠戟棘)."
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 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:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -137,7 +137,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2820,7 +2820,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2854,139 +2854,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3870,13 +3870,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3963,33 +3963,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -3998,7 +3998,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4497,7 +4497,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4529,7 +4529,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4757,7 +4757,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4769,7 +4769,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5123,79 +5123,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5204,430 +5204,430 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--skip-to=<file>"
 msgstr "--pathspec-from-file=<�逵橘剋>"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 #| msgid "--pathspec-from-file=<file>"
 msgid "--rotate-to=<file>"
 msgstr "--pathspec-from-file=<�逵橘剋>"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr "�均戟棘�龜�棘勻逵�� 龜鈞劇筠戟筠戟龜�, 勻 克棘�棘��� 勻�筠 ���棘克龜 極����筠."
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr "-W"
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5765,55 +5765,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
+#, priority:220
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5821,397 +5839,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr "���逵勻龜�� 鈞逵均��菌筠戟戟�橘 極逵克筠� 畇逵戟戟��."
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr "--upload-pack <極���>"
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "���� 劇戟棘均棘�剋棘勻戟筠筠."
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr "-o <棘極�龜�>"
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<棘極�龜�>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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 "�筠�筠畇逵�� 畇逵戟戟�� ���棘克� 戟逵 �筠�勻筠� 極�龜 棘閨劇筠戟筠 畇逵戟戟�劇龜 極棘 極�棘�棘克棘剋� 勻筠��龜龜 2. �逵戟戟逵� ���棘克逵 戟筠 畇棘剋菌戟逵 �棘畇筠�菌逵�� �龜劇勻棘剋� NUL 龜剋龜 LF. 龜棘 克逵克 �筠�勻筠� 閨�畇筠� 棘閨�逵閨逵��勻逵�� ��龜 棘極�龜龜, 勻 �棘劇 �龜�剋筠 戟筠龜鈞勻筠��戟�筠, 鈞逵勻龜�龜� �棘剋�克棘 棘� �筠�勻筠�逵. ��剋龜 極逵�逵劇筠�� `--server-option = <option>` �克逵鈞逵戟 戟筠�克棘剋�克棘 �逵鈞, �棘 勻�筠 ��龜 ���棘克龜 棘�極�逵勻剋����� 畇��均棘橘 ��棘�棘戟筠 勻 �棘劇 極棘��畇克筠, 勻 克棘�棘�棘劇 棘戟龜 �克逵鈞逵戟戟棘劇 勻 克棘劇逵戟畇戟棘橘 ���棘克筠."
 
 #. type: Labeled list
-#: en/fetch-options.txt:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr "��極棘剋�鈞棘勻逵�� �棘剋�克棘 IPv4 畇�筠�逵, 龜均戟棘�龜��� IPv6 逵畇�筠�逵."
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr "��極棘剋�鈞棘勻逵�� �棘剋�克棘 IPv6 逵畇�筠�逵, 龜均戟棘�龜��� 逵畇�筠�逵 IPv4."
@@ -6299,13 +6317,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "�棘 ���剋克筠 linkgit:git-commit[1] 畇棘���極戟� 逵剋��筠�戟逵�龜勻戟�筠 極��龜 畇棘閨逵勻剋筠戟龜� �逵橘剋棘勻 勻 克棘劇劇龜�."
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "������龜�竅"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr "<�極筠�龜�龜克逵�棘�-極��龜>��"
@@ -6335,7 +6353,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr "�逵鈞�筠�龜�� 畇棘閨逵勻剋筠戟龜筠 �逵橘剋棘勻, 克棘�棘��筠 龜戟逵�筠 閨�剋龜 閨� 極�棘龜均戟棘�龜�棘勻逵戟�."
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6365,13 +6383,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr "�棘 ���龜 鈞逵極���龜��� `add --interactive`, 戟棘 極�棘極���龜� 戟逵�逵剋�戟棘筠 劇筠戟� 克棘劇逵戟畇 龜 ��逵鈞� 極筠�筠橘畇筠� 克 極棘畇克棘劇逵戟畇筠 `patch`.  �棘畇�棘閨戟棘 �劇. ``�戟�筠�逵克�龜勻戟�橘 �筠菌龜劇''."
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6545,31 +6563,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<�逵橘剋>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr "\\--"
@@ -6581,7 +6599,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr "葵�棘� 極逵�逵劇筠�� - �逵鈞畇筠剋龜�筠剋�, 克棘�棘��橘 劇棘菌戟棘 龜�極棘剋�鈞棘勻逵�� 畇剋� 棘�畇筠剋筠戟龜� 極逵�逵劇筠��棘勻 克棘劇逵戟畇戟棘橘 ���棘克龜 棘� �極龜�克逵 �逵橘剋棘勻 (極棘剋筠鈞戟棘, 克棘均畇逵 龜劇筠戟逵 �逵橘剋棘勻 劇棘均�� 閨��� 棘�龜閨棘�戟棘 極�龜戟��� 鈞逵 極逵�逵劇筠��� 克棘劇逵戟畇戟棘橘 ���棘克龜)."
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "������竅"
@@ -6959,7 +6977,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "鬼��龜�� 龜����"
@@ -6971,13 +6989,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "赳勻剋�筠��� �逵���� 極逵克筠�逵 linkgit:git[1]"
@@ -7432,7 +7450,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7644,7 +7662,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7944,7 +7962,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr "���圭��叫��揆�赳"
@@ -8214,7 +8232,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8353,7 +8371,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12319,7 +12337,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12703,7 +12721,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14143,7 +14161,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14936,7 +14954,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -15042,7 +15060,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15172,7 +15190,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15184,7 +15202,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15896,557 +15914,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
+#, priority:100
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr "叫畇逵剋龜�� 龜鈞 克棘戟�龜均��逵�龜棘戟戟棘均棘 �逵橘剋逵 �克逵鈞逵戟戟�� �筠克�龜�."
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr "�筠�筠龜劇筠戟棘勻逵�� �克逵鈞逵戟戟�� �筠克�龜�."
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr "叫畇逵剋龜�� 龜鈞 克棘戟�龜均��逵�龜棘戟戟棘均棘 �逵橘剋逵 ���棘克�, �棘棘�勻筠���勻����� 鈞逵畇逵戟戟棘劇� 克剋���."
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr "叫畇逵剋龜�� 龜鈞 克棘戟�龜均��逵�龜棘戟戟棘均棘 �逵橘剋逵 勻�筠 ���棘克龜, �棘棘�勻筠���勻���龜筠 克剋���."
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr "�筠�筠�龜�剋龜�� 勻�筠 極筠�筠劇筠戟戟�筠 龜 龜� 鈞戟逵�筠戟龜�, ���逵戟棘勻剋筠戟戟�筠 勻 克棘戟�龜均��逵�龜棘戟戟棘劇 �逵橘剋筠."
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr "--type <�龜極>"
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr "�棘極���龜劇�劇龜 `<�龜極>`逵劇龜 �勻剋�����:"
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, priority:100
 msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
 msgstr "��克��勻逵筠� �筠畇逵克�棘� 畇剋� 龜鈞劇筠戟筠戟龜� �克逵鈞逵戟戟棘均棘 �逵橘剋逵 克棘戟�龜均��逵�龜龜; `--system`, `--global` 龜剋龜 �筠極棘鈞龜�棘�龜� (極棘 �劇棘剋�逵戟龜�)."
 
 #. type: Labeled list
-#: en/git-config.txt:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr "--default <鈞戟逵�筠戟龜筠>"
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, priority:100
 msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
 msgstr "��剋龜 �逵橘剋 戟筠 �克逵鈞逵戟 �勻戟棘 � 極棘劇棘��� `--file`, 'git config' 龜�筠� 極逵�逵劇筠��� 克棘戟�龜均��逵�龜龜 勻 �剋筠畇���龜� �筠����� �逵橘剋逵�:"
 
 #. type: Labeled list
-#: en/git-config.txt:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr "$(prefix)/etc/gitconfig"
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr "鬼龜��筠劇戟�橘 �逵橘剋 克棘戟�龜均��逵�龜龜."
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr "$XDG_CONFIG_HOME/git/config"
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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 "��棘�棘橘 極棘剋�鈞棘勻逵�筠剋��克龜橘 �逵橘剋 克棘戟�龜均��逵�龜龜. ��剋龜 極筠�筠劇筠戟戟逵� $XDG_CONFIG_HOME 戟筠 鈞逵畇逵戟逵 龜剋龜 極���逵, 龜�極棘剋�鈞�筠��� `$HOME/.config/git/config`. ��閨逵� 極筠�筠劇筠戟戟逵� �棘 �克逵剋��戟�劇 鈞戟逵�筠戟龜筠劇 (戟筠 �極龜�棘克) 閨�畇筠� 極筠�筠鈞逵極龜�逵戟逵 逵戟逵剋棘均龜�戟棘橘 極筠�筠劇筠戟戟棘橘, 鈞逵畇逵戟戟棘橘 勻 �逵橘剋筠 `~/.gitconfig`. �筠 �筠克棘劇筠戟畇�筠��� �棘鈞畇逵勻逵�� ��棘� �逵橘剋, 筠�剋龜 勻� 勻�筠劇� 棘� 勻�筠劇筠戟龜 龜�極棘剋�鈞�筠�筠 閨棘剋筠筠 ��逵��筠 勻筠��龜龜 Git, �逵克 克逵克 極棘畇畇筠�菌克逵 ��棘均棘 �逵橘剋逵 閨�剋逵 畇棘閨逵勻剋筠戟逵 戟筠 �逵克 畇逵勻戟棘."
 
 #. type: Labeled list
-#: en/git-config.txt:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr "~/.gitconfig"
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr "$GIT_DIR/config"
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr "$GIT_DIR/config.worktree"
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16509,14 +16521,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16527,7 +16551,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16537,7 +16561,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16547,7 +16571,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16557,7 +16581,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16569,157 +16593,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16729,13 +16753,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16748,19 +16772,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16768,13 +16792,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19411,103 +19435,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr "--match <�逵閨剋棘戟>"
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr "--exclude <�逵閨剋棘戟>"
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, fuzzy, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr "筠�剋龜 戟筠 戟逵橘畇筠戟棘, 極棘克逵鈞逵�� �棘克�逵�筠戟戟�橘 戟棘劇筠� �筠畇逵克�龜龜 克棘劇劇龜�逵"
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19517,25 +19541,25 @@ msgstr ""
 "\tv1.0.4-14-g2414721\n"
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19545,13 +19569,13 @@ msgstr ""
 "\tv1.0.4\n"
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19561,7 +19585,7 @@ msgstr ""
 "\ttags/v1.0.0-21-g975b\n"
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19571,13 +19595,13 @@ msgstr ""
 "\theads/lt/describe-7-g975b\n"
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19587,37 +19611,37 @@ msgstr ""
 "\ttags/v1.0.0\n"
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr "鬼龜��龜���赳 ���鬼��"
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19647,19 +19671,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20247,7 +20271,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20430,14 +20454,15 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
-msgstr ""
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
+msgstr "'git diff' [<棘極�龜龜>] <克棘劇劇龜�> <克棘劇劇龜�> [--] [<極���>��]"
 
 #. type: Plain text
 #: en/git-diff.txt:64
@@ -20445,112 +20470,118 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 #| msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr "'git diff' [<棘極�龜龜>] <克棘劇劇龜�> <克棘劇劇龜�> [--] [<極���>��]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 #| msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr "'git diff [<棘極�龜龜>] <克棘劇劇龜�>\\... <克棘劇劇龜�> [--] [<極���>��]"
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "'git diff' [<棘極�龜龜>] <克棘劇劇龜�>..<克棘劇劇龜�> [--] [<極���>��]"
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "'git diff [<棘極�龜龜>] <克棘劇劇龜�>\\... <克棘劇劇龜�> [--] [<極���>��]"
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20559,31 +20590,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20592,31 +20623,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20625,31 +20656,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20658,31 +20689,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20690,19 +20721,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27915,7 +27946,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31359,374 +31390,374 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, fuzzy, no-wrap, priority:260
 #| msgid "CONFIGURATION"
 msgid "DIFF FORMATTING"
 msgstr "���圭��叫��揆�赳"
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr "鬼劇棘��龜 linkgit:git-shortlog[1]."
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36837,7 +36868,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36853,7 +36884,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -37057,7 +37088,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -37093,7 +37124,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37202,7 +37233,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37765,9 +37796,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-pull.txt:121
-#, priority:220
-msgid "When false, merge the current branch into the upstream branch."
-msgstr ""
+#, fuzzy, priority:220
+msgid "When false, merge the upstream branch into the current branch."
+msgstr "��龜劇筠戟筠戟龜筠 �極棘��畇棘�筠戟戟棘均棘 �極龜�克逵 極逵��筠橘 戟逵畇 �筠克��筠橘 勻筠�克棘橘"
 
 #. type: Plain text
 #: en/git-pull.txt:123
@@ -38254,7 +38285,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43397,115 +43428,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44578,7 +44609,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46964,521 +46995,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47488,151 +47537,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47643,25 +47692,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47670,19 +47719,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49335,253 +49384,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, fuzzy, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr "pop [--index] [-q|--quiet] [<stash>]"
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, fuzzy, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr "apply [--index] [-q|--quiet] [<�極���逵戟戟�筠-龜鈞劇筠戟筠戟龜�>]"
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, fuzzy, no-wrap, priority:240
 msgid "store"
 msgstr "劇龜戟-畇剋龜戟逵"
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49590,31 +49639,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49626,13 +49675,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49647,13 +49696,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49665,19 +49714,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49692,19 +49741,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49713,7 +49762,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51812,7 +51861,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57933,7 +57982,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58239,9 +58288,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-worktree.txt:246
-#, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
-msgstr ""
+#, fuzzy, priority:240
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
+msgstr "�筠�筠克剋��筠戟龜筠 勻筠�棘克 龜剋龜 勻棘���逵戟棘勻剋筠戟龜筠 �逵橘剋棘勻 勻 �逵閨棘�筠劇 克逵�逵剋棘均筠"
 
 #. type: Labeled list
 #: en/git-worktree.txt:247
@@ -58433,7 +58482,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58910,7 +58959,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62598,194 +62647,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64373,7 +64458,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64634,56 +64719,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64694,19 +64803,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64718,43 +64827,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.sk.po b/po/documentation.sk.po
index abc62e4447a1304df8799847acac6ffee677de97..12557032ad8d1560005d966ab5197c69392d1af0 100644
--- a/po/documentation.sk.po
+++ b/po/documentation.sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: git-manpages-l 10n\n"
-"POT-Creation-Date: 2021-05-17 17:03+0200\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
 "PO-Revision-Date: 2021-03-02 13:09+0100\n"
 "Last-Translator: Jean-No챘l AVILA <jn.avila@free.fr>\n"
 "Language-Team: Slovak\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -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:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 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:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -137,7 +137,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2816,7 +2816,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2850,139 +2850,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3866,13 +3866,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3959,33 +3959,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "--no-diff-merges"
 msgid "--diff-merges=1"
 msgstr "--no-diff-merges"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "--no-diff-merges"
 msgid "--diff-merges=separate"
@@ -3994,7 +3994,7 @@ msgstr "--no-diff-merges"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4492,7 +4492,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4524,7 +4524,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4751,7 +4751,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4763,7 +4763,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5117,79 +5117,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5198,427 +5198,427 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, no-wrap, priority:280
 msgid "--skip-to=<file>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, no-wrap, priority:280
 msgid "--rotate-to=<file>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, no-wrap, priority:280
 msgid "--ignore-matching-lines=<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5756,55 +5756,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5812,397 +5830,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6285,13 +6303,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr ""
@@ -6321,7 +6339,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6351,13 +6369,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6531,31 +6549,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr ""
@@ -6567,7 +6585,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6921,7 +6939,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6933,13 +6951,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7376,7 +7394,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7588,7 +7606,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7888,7 +7906,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8158,7 +8176,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8296,7 +8314,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12256,7 +12274,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12640,7 +12658,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14062,7 +14080,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14854,7 +14872,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14960,7 +14978,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15090,7 +15108,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15102,7 +15120,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15813,557 +15831,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16424,14 +16436,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16442,7 +16466,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16452,7 +16476,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16462,7 +16486,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16472,7 +16496,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16484,157 +16508,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16644,13 +16668,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16663,19 +16687,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16683,13 +16707,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19325,103 +19349,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19429,25 +19453,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19455,13 +19479,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19469,7 +19493,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19477,13 +19501,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19491,37 +19515,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19551,19 +19575,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20151,7 +20175,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20333,13 +20357,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20348,110 +20372,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20460,31 +20490,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20493,31 +20523,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20526,31 +20556,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20559,31 +20589,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20591,19 +20621,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, 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], linkgit:git-show[1]"
 msgstr ""
@@ -27800,7 +27830,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31235,373 +31265,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36705,7 +36735,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36721,7 +36751,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36925,7 +36955,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -36961,7 +36991,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37070,7 +37100,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37626,7 +37656,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38110,7 +38140,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43244,115 +43274,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44424,7 +44454,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46807,521 +46837,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47331,151 +47379,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47486,25 +47534,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47513,19 +47561,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49171,253 +49219,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49426,31 +49474,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49462,13 +49510,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49483,13 +49531,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49501,19 +49549,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49528,19 +49576,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49549,7 +49597,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51648,7 +51696,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57757,7 +57805,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58064,7 +58112,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -58257,7 +58305,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58734,7 +58782,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62399,194 +62447,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64163,7 +64247,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64424,56 +64508,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64484,19 +64592,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64508,43 +64616,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index 0c2950a3bb8069c7d1603b98460f808248282ee9..53c2fedbc9ac8cad87c2a32ac019958a744e8e96 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.po
@@ -3,10 +3,22 @@
 # This file is distributed under the same license as the Git package.
 # Matthias A횩hauer <mha1993@live.de>, 2019.
 msgid ""
-msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-05-17 17:03+0200\nPO-Revision-Date: 2021-05-20 07:34+0000\nLast-Translator: O휓uz Ersen <oguzersen@protonmail.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: tr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n != 1;\nX-Generator: Weblate 4.7-dev\n"
+msgstr ""
+"Project-Id-Version: git documentation\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
+"PO-Revision-Date: 2021-05-20 07:34+0000\n"
+"Last-Translator: O휓uz Ersen <oguzersen@protonmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.7-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -66,7 +78,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -78,7 +90,7 @@ msgid "Show long rev (Default: off)."
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 msgid "-t"
 msgstr "-t"
@@ -114,7 +126,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -126,7 +138,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2805,7 +2817,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2839,139 +2851,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3855,13 +3867,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3945,31 +3957,31 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, no-wrap, priority:280
 msgid "--diff-merges=first-parent"
 msgstr "--diff-merges=first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, no-wrap, priority:280
 msgid "--diff-merges=1"
 msgstr "--diff-merges=1"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, no-wrap, priority:280
 msgid "--diff-merges=separate"
 msgstr "--diff-merges=separate"
@@ -3977,7 +3989,7 @@ msgstr "--diff-merges=separate"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4472,7 +4484,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4504,7 +4516,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4731,7 +4743,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4743,7 +4755,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5097,79 +5109,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5178,427 +5190,427 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, no-wrap, priority:280
 msgid "--skip-to=<file>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, no-wrap, priority:280
 msgid "--rotate-to=<file>"
 msgstr "--rotate-to=<dosya>"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, no-wrap, priority:280
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-matching-lines=<d체zenli-ifade>"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5736,55 +5748,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5792,397 +5822,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr "--upload-pack <upload-pack>"
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "Ayr캇nt캇l캇 ol."
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<se챌enek>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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 "Protokol s체r체m 2'yi kullanarak ileti힊im kurarken verilen dizgiyi sunucuya aktar.  Verilen dizgide bir NUL veya LF karakteri bulunmamal캇d캇r.  Sunucunun, bilinmeyenler de dahil olmak 체zere sunucu se챌eneklerini i힊lemesi sunucuya 철zg체d체r.  Birden fazla `--server-option=<se챌enek>` verildi휓inde, hepsi komut sat캇r캇nda listelenen s캇rayla di휓er tarafa g철nderilir."
 
 #. type: Labeled list
-#: en/fetch-options.txt:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr "IPv6 adreslerini yok sayarak yaln캇zca IPv4 adreslerini kullan."
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr "IPv4 adreslerini yok sayarak yaln캇zca IPv6 adreslerini kullan."
@@ -6270,13 +6300,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "SE횉ENEKLER"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr "<yol belirtimi>..."
@@ -6306,7 +6336,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6336,13 +6366,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6516,31 +6546,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr ""
@@ -6552,7 +6582,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6906,7 +6936,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6918,13 +6948,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7361,7 +7391,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7573,7 +7603,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7873,7 +7903,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8143,7 +8173,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8281,7 +8311,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12241,7 +12271,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12625,7 +12655,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14047,7 +14077,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14839,7 +14869,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14945,7 +14975,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15075,7 +15105,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15087,7 +15117,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15798,557 +15828,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
+#, priority:100
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16409,14 +16433,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16427,7 +16463,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16437,7 +16473,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16447,7 +16483,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16457,7 +16493,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16469,157 +16505,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16629,13 +16665,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16648,19 +16684,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16668,13 +16704,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19310,103 +19346,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19414,25 +19450,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19440,13 +19476,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19454,7 +19490,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19462,13 +19498,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19476,37 +19512,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19536,19 +19572,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20136,7 +20172,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20318,13 +20354,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20333,110 +20369,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20445,31 +20487,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20478,31 +20520,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20511,31 +20553,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20544,31 +20586,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20576,19 +20618,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, 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], linkgit:git-show[1]"
 msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27785,7 +27827,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31220,373 +31262,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36690,7 +36732,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36706,7 +36748,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36910,7 +36952,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -36946,7 +36988,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37055,7 +37097,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37611,7 +37653,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38095,7 +38137,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43231,115 +43273,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44411,7 +44453,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46794,521 +46836,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47318,151 +47378,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47473,25 +47533,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47500,19 +47560,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49158,253 +49218,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49413,31 +49473,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49449,13 +49509,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49470,13 +49530,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49488,19 +49548,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49515,19 +49575,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49536,7 +49596,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51635,7 +51695,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57744,7 +57804,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58050,9 +58110,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-worktree.txt:246
-#, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
-msgstr ""
+#, fuzzy, priority:240
+#| msgid "`locked`, if the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
+msgstr "횉al캇힊ma a휓ac캇 kilitliyse, `locked`."
 
 #. type: Labeled list
 #: en/git-worktree.txt:247
@@ -58244,7 +58305,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58721,7 +58782,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62386,194 +62447,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64150,7 +64247,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64411,56 +64508,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64471,19 +64592,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64495,43 +64616,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 97f78b73ab311fdfb2dbb3cce21707526bed70a3..03a8c22c06dbb8f851a76fe261aeb624c0e51264 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -3,10 +3,22 @@
 # This file is distributed under the same license as the Git package.
 # Matthias A횩hauer <mha1993@live.de>, 2019.
 msgid ""
-msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-05-17 17:03+0200\nPO-Revision-Date: 2021-07-15 06:32+0000\nLast-Translator: ll06printf <ll06printf@outlook.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.7.2-dev\n"
+msgstr ""
+"Project-Id-Version: git documentation\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
+"PO-Revision-Date: 2021-07-15 06:32+0000\n"
+"Last-Translator: ll06printf <ll06printf@outlook.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_HANS-CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.7.2-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -66,7 +78,7 @@ msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans f
 msgstr "'<start>' �� '<end>' ��룾�됬쉪 `-L <start>` �� `-L <start>,` �껃쎍餓� '<start>' �경뻼餓뜻쑌弱얇�� `-L ,<end>` 餓롦뻼餓뜹�冶뗥댆 '<end>'."
 
 #. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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"
@@ -78,7 +90,7 @@ msgid "Show long rev (Default: off)."
 msgstr "�양ㅊ�욤쉬竊덆퍡溫ㅵ�쇽폏�녜뿭竊됥��"
 
 #. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 msgid "-t"
 msgstr "-t"
@@ -114,7 +126,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
 msgstr "�묈뎺瘟껆뵪�녶뤁溫겼퐬竊뚩�뚥툖�묈릮瘟껆뵪�녶뤁溫겼퐬�� 訝롥끀�양ㅊ烏뚧��①쉪岳��竊뚥툖�양ㅊ烏뚧��①쉪���롣�訝や엶溫㏂�� 瓦쇿갚��誤곮퓵烏뚥�楹삣닓岳��竊뚥풃倻괪TART..END竊뚦끀訝�쉪壤믣뭿瓮�푶�쮁TART訝��� 訝뷸뼶堊욤돈鰲곻펽弱냛it blame --reverse START�귛퐪鵝쐅it blame --reverse START..HEAD��"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -126,7 +138,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -1637,8 +1649,8 @@ msgstr ""
 msgid "linkgit:git-name-rev[1]"
 msgstr "linkgit:git-name-rev[1]"
 
-# �ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁�
 #. type: Plain text
+# �ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁�
 #: en/cmds-plumbinginterrogators.txt:39
 #, priority:100
 msgid "Find symbolic names for given revs."
@@ -2815,8 +2827,9 @@ 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."
+#, fuzzy, 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."
+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. Defaults to true."
 msgstr "倻귝옖瘟껆뵪 merge �뜻깹�됦뻣鵝뺞룓雅ㅵ뢿�곤펽�숅�싪퓝鵝욜뵪耶섇궓�ⓨ끀瓦쒐쮮瓮잒릉�녷뵱訝�쉪���롨쭆野잌�쇗씎�덂뭉訝뷴퐪�띶늽��뀓營�쉪訝딀만�녷뵱��  `branch.<current branch>.merge`�꾢�쇌폏熬ユ윥�낉펽瓦쇾틳�쇔뫝�띴틙��`branch.<current branch>.remote`�썲릫�꾥퓶葉뗥늽��펽�뜹릮�싪퓝`remote.<remote>.fetch`弱녶츆餓ф삝弱꾢댆�멨틪�꾥퓶葉뗨퇎甕ゅ늽��펽亮뜹릦亮띈퓳雅쏂퇎甕ゅ늽��쉪�먪ㅊ��"
 
 #. type: Labeled list
@@ -2850,139 +2863,140 @@ 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."
+#: en/config/merge.txt:42
+#, fuzzy, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr "�ⓨ릦亮띈퓝葉뗤릎�㎬죱�띶릫汝�役뗦뿶誤곮�껇솑�꾣뻼餓뜻빊�륅폑倻귝옖亦→쐣�뉐츣竊뚪퍡溫ㅴ맏diff.renameLimit�꾢�쇈�귛쫩�쒒뇥�띷�役뗨˙�녜뿭竊뚩퓳訝よ�營�갚亦→쐣鵝쒐뵪��"
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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 "Git��맔鴉싨�役뗩뇥�띲��  倻귝옖溫양쉰訝� \"false\"竊뚪뇥�띷�役뗨˙獵곭뵪�귛쫩�쒑�營�맏 \"true\"竊뚦닕��뵪�뷸쑍�띶릫汝�役뗣��  容섋�訝� diff.renames �꾢�쇈��"
 
 #. type: Labeled list
-#: en/config/merge.txt:46
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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 "Git��맔汝�役뗧쎅壤뺡뇥�랃펽壤긷뱧�ⓨ릦亮뜻뿶野밧럣�꿜�堊㎫쉪��퐬熬ラ뇥�썲릫�뜹뒥�η쉪�경뻼餓띄쉪鸚꾤릤��  倻귝옖merge.directoryRenames溫양쉰訝� \"false\"竊뚨쎅壤뺡뇥�띷�役뗥컛熬ョ쫨�⑨펽瓦숁꼷�녕�瓦쇾틳�경뻼餓뜹컛熬ラ걮�쇿쑉�㎫쎅壤뺜릎��  倻귝옖溫양쉰訝� \"true\"竊뚨쎅壤뺡뇥�띷�役뗨˙��뵪竊뚧꼷�녕�瓦숁졆�꾣뼭�뉏뻑弱녻˙燁삣댆�곁쎅壤뺜릎��  倻귝옖溫양쉰訝� \"�꿰챳\"竊뚦컛�ε몜閭ㅷ굳瓮�푶�꾢넳囹곥��  倻귝옖merge.renames訝튴alse竊똫erge.directoryRenames弱녻˙恙썹븼亮띈˙鰲녵맏false��  容섋�訝� \"�꿰챳\"��"
 
 #. type: Labeled list
-#: en/config/merge.txt:59
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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 "�딂칹 Git 餓볟틩訝�뻼餓띄쉪閭ｅ닕烏①ㅊ力뺡쉹���띌뿴�꾣렓燁삭�뚧뵻�섓펷堊뗥쫩竊뚧뿩�잏쉪�먧벡溫겼퐬�뉑쑍�뉏뻑鵝욜뵪 CRLF 烏뚨퍜弱억펽鵝녷�瓦묊쉪�먧벡鵝욜뵪 LF 烏뚨퍜弱억펹��  �②퓳�루쉪餓볟틩訝�펽Git ��빳�ⓩ돢烏뚦릦亮뜸퉳�띶컛�먧벡�꾣빊��쉬�㏘맏鰲꾥똽�꾢숱凉륅펽餓ε뇧弱묇툖恙낁쫨�꾢넳囹곥��  �닷쩀岳→겘竊뚩��귡쁾 linkgit:gitattributes[5] 訝�쉪 \"�덂뭉�룡쐣訝띶릪嶺얍뀯/嶺얍눣掠욄�㎫쉪�녷뵱 \"訝��귙��"
 
 #. type: Labeled list
-#: en/config/merge.txt:69
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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 "��맔�ⓨ릦亮띄퍜�잌릮�볟뜲ORIG_HEAD�뚦릦亮띄퍜�쒍퉳�당쉪藥�펰瀯잒�烏ⓦ��  容섋�訝� \"��\"��"
 
 #. type: Labeled list
-#: en/config/merge.txt:73
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr "壤볢�營�맏 \"true \"�띰펽�ⓩ뱧鵝쒎�冶뗥뎺�ゅ뒯�쎾뻠訝�訝や릿�띄쉪�②뿈佯볠씉��펽亮뜹쑉�띴퐳瀯볠씇�롥틪�ⓨ츆��  瓦숁꼷�녕�鵝졾룾餓ε쑉訝�訝よ궙�뤹쉪藥δ퐳�묇툓瓦먫죱merge��  �띈�뚳펽誤곩컦恙껂슴�⑨폏�ⓩ닇�잏쉪�덂뭉阿뗥릮竊뚧��롧쉪�②뿈佯볟틪�ⓨ룾�썰폏野쇠눜�욃츩兀ⓩ�㎫쉪�꿰챳��  瓦쇾릉�됮」��빳熬� linkgit:git-merge[1] �� `--no-autostash` �� `--autostash` �됮」誤녺썣��  容섋�訝튴alse��"
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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 "�㎩댍linkgit:git-mergetool[1]鵝욜뵪�や릉�덂뭉藥ε끁��  訝뗩씊�꾢닓烏ⓩ샑鹽뷰틙�됪븞�꾢냵營��쇈��  餓삡퐬�뜸퍟�쇤꺗熬ヨ쭍訝븃눎若싦퉱�꾢릦亮뜹램�뤄펽��誤곩츣阿됦�訝ょ쎑佯붺쉪mergetool.<tool>.cmd�섌뇧��"
 
 #. type: Labeled list
-#: en/config/merge.txt:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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 "�㎩댍linkgit:git-mergetool[1]�ⓩ뙁若�-g/-gui�뉐퓱�뜸슴�①쉪�덂뭉藥ε끁�귚툔�®쉪�쀨〃�양ㅊ雅녷쐣�덄쉪�끿쉰�쇈��  餓삡퐬�뜸퍟�쇤꺗熬ヨ쭍訝븃눎若싦퉱�꾢릦亮뜹램�뤄펽��誤곩츣阿됦�訝ょ쎑佯붺쉪mergetool.<guitool>.cmd�섌뇧��"
 
 #. type: Labeled list
-#: en/config/merge.txt:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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 "�㎩댍�믣퐩�덂뭉嶺뽫븼���양ㅊ�꾥풏�븅뇧��  0瀛㏝솮雅녶쑉汝�役뗥댆�꿰챳�뜻쐣訝�訝ゆ�瀯덄쉪�숃�岳→겘鸚뽳펽餓�阿덆꺗訝띹풏�뷩��1瀛㎩룵渦볟눣�꿰챳竊�2瀛㎬풏�뷴넳囹곩뭽�뉏뻑�섇뙑��  5瀛㎩룋餓δ툓渦볟눣瘟껇캊岳→겘��  容섋���К2瀛㎯��  ��빳�싪퓝`GIT_MERGE_VERBOSITY`��쥊�섌뇧誤녺썣��"
 
 #. type: Labeled list
-#: en/config/merge.txt:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr "�덂뭉.<driver>.name"
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, priority:240
 msgid "Defines a human-readable name for a custom low-level merge driver.  See linkgit:gitattributes[5] for details."
 msgstr "訝븃눎若싦퉱�꾡퐥瀛㎩릦亮띌㈀�ⓨ츣阿됦틙訝�訝や볶映삣룾瑥사쉪�띶춻��  瑥�깄鰲� linkgit:gitattributes[5]��"
 
 #. type: Labeled list
-#: en/config/merge.txt:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3930,13 +3944,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr "�잍닇���싩쉪烏δ툈竊뚥툖�양ㅊ藥�펰�뜻�곻펷diffstats竊됥��"
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -4024,33 +4038,34 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
-#, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+#: en/diff-options.txt:55
+#, fuzzy, priority:280
+#| msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr "瑥ι�됮」鵝욕릦亮뜻룓雅ㅷ쉪藥�펰渦볟눣餓ι퍡溫ㅶ졏凉뤸샑鹽뷩��`-m`�ゆ쐣��`-p`�꾣깄�듕툔�띴폏雅㎫뵟渦볟눣�귡퍡溫ㅶ졏凉뤷룾餓ι�싪퓝`log.diffMerges`�띸쉰�귝빊�밧룜竊뚪퍡溫ㅵ�쇌맏`separate`��"
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr "閭ㅹ�됮」鵝욕릦亮뜻룓雅ㅵ룵�양ㅊ訝롧К訝�訝ょ댍�먧벡阿뗩뿴�꾢츑�닷량凉귙��"
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -4060,7 +4075,7 @@ msgstr "diffmerge"
 #: en/diff-options.txt:66
 #, fuzzy, priority:280
 #| msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. `-m` doesn't produce any output without `-p`."
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr "瓦쇾슴孃쀥릦亮뜻룓雅ㅶ샑鹽뷰틙驪뤶릉�뜻룓雅ㅴ퉳�당쉪若뚧빐藥�펰�귝캀訝ょ댍�먧벡�썰폏雅㎫뵟�뺟떖�꾣뿥恙쀩」�뚦량凉귙��`-m` �됮」�ⓩ깹�� `-p` �됮」�뜸툖鴉싦벨�잋뻣鵝뺠풏�뷩��"
 
 #. type: Labeled list
@@ -4564,7 +4579,7 @@ msgid "Synonym for `-p --stat`."
 msgstr "�뚥퉱瑥� '-p --stat'��"
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4598,7 +4613,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr "倻귝옖亦→쐣瓦쇾릉�됮」竊뚦를 \"訝띶만鰲�\" 耶쀧Е�꾥러孃꾢릫鴉싪˙凉뺟뵪竊뚧�倻귡뀓營�룜�� `core.quotePath` ��鰲ｉ뇢�꾦궍�뤄펷�귟쭅 linkgit:git-config[1]竊됥��"
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4830,7 +4845,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, fuzzy, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "恙썹븼烏뚦갼令뷸졏�꾢룜�뽧��"
@@ -4842,7 +4857,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, fuzzy, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr "恙썹븼令뷸졏�곈뇧�꾢룜�뽧�귟퓳鴉싧옙�θ죱弱양쉪令뷸졏竊뚦뭉溫ㅴ맏�끻맜訝�訝ゆ닑鸚싦릉令뷸졏耶쀧Е�꾢끀餓뽩틣�쀩꺗��춬�뚨쉪��"
@@ -5205,79 +5220,79 @@ msgid "-l<num>"
 msgstr "-l<�곈뇧>"
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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 "`-M` �� `-C` �됮」��誤� O(n^2) �꾢쨪�녷뿶�댐펽�뜸릎 n ��퐳�①쉪�띶뫝��/鸚띶댍��젃�곈뇧�귛쫩�쒒뇥�썲릫/鸚띶댍��젃�꾣빊�뤺텈瓦뉏틙�뉐츣�꾣빊�륅펽瑥ι�됮」��삻閭�뇥�썲릫/鸚띶댍汝�役뗨퓧烏뚣��"
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
+msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
 
 #. type: Plain text
-#: en/diff-options.txt:609
+#: en/diff-options.txt:615
 #, 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 "�ら�됪떓曆삣뒥竊�`A`竊됥�곩쨳�띰펷`C`竊됥�곩닠�ㅿ펷`D`竊됥�곦엶�뱄펷`M`竊됥�곲뇥�썲릫竊�`R`竊됥�곭굳�뗰펷�녑만鰲꾣뻼餓뜰�곭Е�룬벦�γ�곩춴與▼쓼......竊됪뵻�섓펷`T`竊됥�곫쑋�덂뭉竊�`U`竊됥�곫쑋�ο펷`X`竊됪닑�띶�熬ョ졃�륅펷`B`竊됬쉪�뉏뻑�귛룾餓δ슴�②퓝譯ㅵ춻寧�쉪餓삡퐬瀯꾢릦竊덂똿�х㈉竊됥�귛퐪瀯꾢릦訝�뒥�� `*`竊덂뀲�ⓩ닑令븝펹�띰펽倻귝옖�ⓩ캈渦껂릎�됦뻣鵝뺞뻼餓뜸툗�뜸퍟�▽뻑�백뀓竊뚦닕�됪떓���됭러孃꾬폑倻귝옖亦→쐣寧�릦�뜸퍟�▽뻑�꾣뻼餓띰펽�쇾툖鴉싮�됪떓餓삡퐬�끻���"
 
 #. type: Plain text
-#: en/diff-options.txt:612
+#: en/diff-options.txt:618
 #, priority:280
 msgid "Also, these upper-case letters can be downcased to exclude.  E.g.  `--diff-filter=ad` excludes added and deleted paths."
 msgstr "��쨼竊뚩퓳雅쎾ㄷ�쇿춻驪띴튋��빳�싪퓝鵝욜뵪弱뤷넍�믧솮�귚풃倻귨폏`--diff-filter=ad` �믧솮曆삣뒥�뚦닠�ㅷ쉪瓮�푶��"
 
 #. type: Plain text
-#: en/diff-options.txt:618
+#: en/diff-options.txt:624
 #, 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 "瑥룡낏�륅펽亮뜸툖����됬쉪藥�펰�썼꺗�끻맜���됬굳�뗣�귚풃倻귨펽餓롧뇨凉뺝댆藥δ퐳�묊쉪藥�펰麗멱퓶訝띴폏�됪렌�좑펷Added竊됪씉��펷�졽맏藥�펰訝�똿�ョ쉪瓮�푶�녶룛榮℡폊訝�쉪�끻��꾦솏�띰펹�귛릪�뤄펽倻귝옖獵곫�汝�役뗥쨳�뜹뭽�띶뫝�띸쉪�←쎅竊뚩퓳雅쏁굳�뗤튋訝띴폏�븀렟��"
 
 #. type: Labeled list
-#: en/diff-options.txt:619
+#: en/diff-options.txt:625
 #, fuzzy, no-wrap, priority:280
 msgid "-S<string>"
 msgstr "-S<string>"
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, fuzzy, 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 "壤볠궓閭ｅ쑉野삥돻簾�늾�꾡빰�곩쓼竊덂쫩瀯볠엫鵝볩펹竊뚦뭉訝붹꺍�ι걪瑥ε쓼�ら쫿轝▼눣�겻빳�η쉪�녶뤁溫겼퐬�띰펽瓦쇿컛�욃만�됬뵪竊싮�싪퓝 `-S` �됮」瓦�빰竊뚦컛�잍뻼餓뜸릎�꾣꽏�닺땃�꾢쓼�양ㅊ�븝펽亮띄빵瀯�퓵烏뚳펽�닷댆�룟풓瑥ε쓼�꾤К訝�訝ょ뎵�с��"
 
 #. type: Plain text
-#: en/diff-options.txt:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr "雅뚩퓵�뜻뻼餓뜸튋鴉싪˙�쒐뇨�겹��"
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, fuzzy, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr "-G<regex>"
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr "�ζ돻�띈‥訝곫뻼�у똿�ヤ툗 <閭ｅ닕烏②씨凉�> �백뀓�꾣렌��/�좈솮烏뚨쉪藥�펰��"
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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 "訝뷰틙瑥닸삇 `-S<閭ｅ닕烏②씨凉�> --pickaxe-regex` �� `-G<閭ｅ닕烏②씨凉�>` 阿뗩뿴�꾢뙷�ワ펽�뉓��먩А�먧벡�ⓨ릪訝��뉏뻑訝�쐣餓δ툔藥�펰竊�"
 
 #. type: delimited block -
-#: en/diff-options.txt:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5289,427 +5304,427 @@ msgstr ""
 "-    hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr "`git log -G \"frotz\\(nitfol\"` 鴉싨샑鹽븃퓳轝→룓雅ㅿ펽鵝� `git log -S \"frotz\\(nitfol\" --pickaxe-regex` 訝띴폏�양ㅊ竊덂썱訝븃�耶쀧Е訝꿰쉪�븀렟轝→빊亦→쐣�밧룜竊됥��"
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, fuzzy, priority:280
 msgid "Unless `--text` is supplied patches of binary files without a textconv filter will be ignored."
 msgstr "�ㅹ씆�먧풘 `--text`竊뚦맔�숁깹�� textconv 瓦뉑빱�①쉪雅뚩퓵�뜻뻼餓띈‥訝곩컛熬ュ옙�γ��"
 
 #. type: Plain text
-#: en/diff-options.txt:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr "�닷쩀岳→겘瑥룟뢿鰲� linkgit:gitdiffcore[7] 訝�쉪 'pickaxe' �←쎅��"
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, fuzzy, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr "--find-object=<object-id>"
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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 "�ζ돻�뉐츣野배괌�븀렟轝→빊�꾢량凉귙�귚툗 `-S` 映삡세竊뚦룵��뢿�겻툖�뚳폏若껂툖�쒐뇨�밧츣�꾢춻寧╊림竊뚩�뚧삸�쒐뇨�밧츣�꾢�穩� id��"
 
 #. type: Plain text
-#: en/diff-options.txt:664
+#: en/diff-options.txt:670
 #, 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 "瑥ε�穩▼룾餓ζ삸訝�訝� blob �뽨�訝ゅ춴與▼쓼�먧벡�귛츆�뤷뫑�� `git-log` 訝�쉪 `-t` �됮」阿잒꺗�얍댆藥δ퐳�묆��"
 
 #. type: Labeled list
-#: en/diff-options.txt:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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 "壤볞슴�� `-S` �� `-G` �됮」�얍댆訝�訝ゆ쎍�방뿶竊뚧샑鹽븃��닸뵻�녵릎�꾣��됪쎍�뱄펽�뚥툖餓끺퍎��샑鹽뷴똿�� <string> �닸뵻�꾣뻼餓뜰��"
 
 #. type: Labeled list
-#: en/diff-options.txt:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, priority:280
 msgid "Treat the <string> given to `-S` as an extended POSIX regular expression to match."
 msgstr "弱� `-S` �됮」�� <string> �귝빊壤볞퐳�⒴콝�� POSIX 閭ｅ닕烏②씨凉뤸씎�백뀓��"
 
 #. type: Labeled list
-#: en/diff-options.txt:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr "-O<窈뷴틣�㎩댍�뉏뻑>"
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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 "�㎩댍�뉏뻑�②풏�뷰릎�븀렟�꾦『佯뤵�귟퓳弱녻쫮�� `diff.orderFile` �띸쉰�섌뇧竊덂뢿鰲� linkgit:git-config[1]竊됥�귟쫨�뽪텋 `diff.orderFile`竊뚩�鵝욜뵪 `-O/dev/null`��"
 
 #. type: Plain text
-#: en/diff-options.txt:693
+#: en/diff-options.txt:699
 #, 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 "渦볟눣窈뷴틣�� <窈뷴틣�㎩댍�뉏뻑> 訝�쉪 glob 與▼폀�꾦『佯뤷넶若싥�귝��됭러孃꾢릫訝롧К訝�訝ゆÆ凉뤷뙶�띸쉪�뉏뻑腰뽩뀍渦볟눣竊뚩러孃꾢릫訝롧К雅뚥릉與▼폀�백뀓竊덁퐜訝띴툗寧т�訝ゆÆ凉뤷뙶�랃펹�꾣뻼餓뜹끀轝↑풏�븝펽餓ζ�映삥렓�귝��됭러孃꾢릫訝롣뻣鵝뺞Æ凉뤷뙶�띸쉪�뉏뻑鴉싨��롨풏�븝펽弱긷깗�ⓩ뻼餓뜻쑌弱얏쐣訝�訝ら쉺�ョ쉪�③깿�백뀓與▼폀�귛쫩�쒎쩀訝よ러孃꾢릫�룡쐣�멨릪�꾤춬瀛㏆펷若껂뺄�백뀓�멨릪�꾣Æ凉륅펽鵝녷깹�됧뙶�띶뀍�띸쉪與▼폀竊됵펽若껂뺄�멨�雅롥슨閭ㅷ쉪渦볟눣窈뷴틣���躍며쉪��"
 
 #. type: Plain text
-#: en/diff-options.txt:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr "<窈뷴틣�㎩댍�뉏뻑> �쇔폀倻귚툔竊�"
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr "令븀쇋烏뚥폏熬ュ옙�ο펽�졿���빳�ⓨ츆餓т퐳訝뷴늽�붺Е竊뚥빳岳앲칮����㎯��"
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr "驪뤶�烏뚪꺗�끻맜訝�訝ゆÆ凉뤵��"
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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 "與▼폀�꾥�力뺝뭽瑥�퉱訝� fnmatch(3) 訝�슴�①쉪�멨릪竊뚥툖�끾떖 FNM_PATHNAME �뉐퓱竊뚥퐜�ⓨ닠�ㅸ러孃꾢릫訝�퍜弱얌뻣�뤷뇿訝ゆ닇�녶릮�백뀓�꾣깄�듕툔堊뗥쨼�귚풃倻귨펽與▼폀 \"`foo*bar`\" �백뀓 \"`fooasdfbar`\" �� \"`foo/bar/baz/asdf`\"竊뚥퐜訝띶뙶�� \"`foobarx`\"��"
 
 #. type: Labeled list
-#: en/diff-options.txt:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 msgid "--skip-to=<file>"
 msgstr "--output=<�뉏뻑>"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 msgid "--rotate-to=<file>"
 msgstr "--template=<file>"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr "餓롨풏�뷰릎訝℡펱�썲릫訝� <�뉏뻑> 阿뗥뎺�꾣뻼餓띰펷�� '瓮녘퓝'竊됵펽�뽩컛若껂뺄燁삣댆渦볟눣�꾣쑌弱억펷�� '�뗨쉬'竊됥�귟퓳雅쏃�됮」訝삭쫨��맏雅녵슴�� `git difftool` �썰빱�뚧렌�좂쉪竊뚦쑉�뜸퍟�끻넻訝뗥룾�썰툖��푽�됬뵪��"
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, fuzzy, no-wrap, priority:280
 msgid "-R"
 msgstr "-R"
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr "--relative[=<瓮�푶>]"
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr "壤볞퍗窈밭쎅�꾢춴��퐬訝�퓧烏뚧뿶竊뚦룾餓ζ럲�ㅷ쎅壤뺝쨼�꾢룜�뽳펽亮띌�싪퓝瓦쇾릉�됮」�양ㅊ�멨�雅롥츆�꾥러孃꾢릫�귛퐪鵝졽툖�ⓨ춴��퐬訝�뿶竊덁풃倻귛쑉瀛�퍜佯볞릎竊됵펽鵝졾룾餓ι�싪퓝 <瓮�푶> �귝빊�ζ뙁�롨쫨鵝욤풏�븀쎑野밥틢�や릉耶먪쎅壤뺛��`--no-relative` ��빳�ⓩ씎�뽪텋 `diff.relative`�띸쉰�됮」�뚥퉳�띸쉪 `--relative` �됮」��"
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, fuzzy, priority:280
 msgid "Treat all files as text."
 msgstr "弱녵��뉓풏�ζ뻼餓띈쭍訝뷸뻼�с��"
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr "�②퓵烏뚧캈渦껅뿶竊뚦옙�θ죱�ョ쉪�욆쉐��"
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr "恙썹븼令븀쇋烏뚨쉪�섇뙑��"
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, fuzzy, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr "-G<regex>"
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-paths=<regex>"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, fuzzy, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr "瓦쇾릉�됮」��빳熬ユ뙁若싧쩀轝▲��"
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, fuzzy, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr "--inter-hunk-context=<lines>"
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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 "�양ㅊ�쀥량凉귚퉳�당쉪訝듾툔�뉛펽��鸚싨샑鹽뷸뙁若싩쉪烏뚧빊竊뚥퍗�뚦릦亮뜹슨閭ㅶ렏瓦묊쉪�쀣�� 容섋�溫ㅴ맏 `diff.interHunkContext`竊뚦쫩�쒒뀓營��됮」�よ�營�펽�숅퍡溫ㅴ맏0��"
 
 #. type: Labeled list
-#: en/diff-options.txt:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, fuzzy, no-wrap, priority:280
 msgid "-W"
 msgstr "-W"
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr "�ⓩ캀訝や엶�밥릎�꾡툓訝뗦뻼烏뚧샑鹽뷸빐訝ゅ눦�겹�귛눦�겼릫燁곁쉪簾�츣�밧폀訝� `git diff` 溫←츞烏δ툈鸚당쉪�밧폀�멨릪竊덂뢿鰲� linkgit:gitattributes[5] 訝�쉪 '�ゅ츣阿됧뙷�쀥ㅄ' 竊됥��"
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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 "溫⑴쮮佯뤶빳映삡세 diff(1) �꾡빰�곲���뷩�귚튋弱길삸瑥댐펽倻귝옖�됧량凉귛닕瓦붷썮1竊뚦맔�숃퓭��0��"
 
 #. type: Labeled list
-#: en/diff-options.txt:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr "獵곭뵪葉뗥틣�꾣��됭풏�뷩�귝슅�� `--exit-code`��"
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, fuzzy, 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 "�곮��㎬죱鸚뽭깿藥�펰�ⓦ�귛쫩�쒍퐷�� linkgit:gitattributes[5] 溫양쉰雅녵�訝ゅ쨼�ⓨ량凉귡㈀�①쮮佯륅펽鵝좈�誤곩쑉 linkgit:git-log[1] �뚨쎑�녑뫝餓ㅴ릎鵝욜뵪瓦쇾릉�됮」��"
 
 #. type: Labeled list
-#: en/diff-options.txt:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr "獵곫�鵝욜뵪鸚뽭깿藥�펰�ⓦ��"
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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 "�곮�竊덃닑訝띶뀅溫몌펹�ⓩ캈渦껂틠瓦쎾댍�뉏뻑�띈퓧烏뚦쨼�ⓩ뻼�ц쉬��퓝譯ㅵ솳�귟��낁��귟쭅 linkgit:gitattributes[5] �귞뵳雅롦뻼�ц쉬��퓝譯ㅵ솳�싧만��뜒�묋쉬��펽�졿�雅㎫뵟�꾢량凉귡�귛릦雅븀굳�ⓩ댎鵝욜뵪竊뚥퐜訝띹꺗佯붺뵪竊늏pply竊됥�귛썱閭ㅹ퍡溫ㅶ깄�듕툔竊뚦룵�� linkgit:git-diff[1] �� linkgit:git-log[1] ��뵪�뉑쑍饔ф뜟瓦뉑빱�⑨펽�� linkgit:git-format-patch[1] �� diff plumbing �썰빱�쇾툖��뵪��"
 
 #. type: Labeled list
-#: en/diff-options.txt:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr "--ignore-submodules[=<when>]"
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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 "�①뵟�먨량凉귝뿶恙썹븼耶먩Æ�쀧쉪岳�뵻��<when> ��빳�� \"none\"��\"untracked\"��\"dirty \" �� \"all\"竊�\"all\" ��퍡溫ㅹ�됮」�귚슴�� \"none\" 鴉싧쑉耶먩Æ�쀥똿�ユ쑋瓮잒릉�뽨엶�밭쉪�뉏뻑竊뚧닑�끻츆�껰EAD 訝롣툓瀛㏝」��릎溫겼퐬�꾣룓雅ㅴ툖�뚧뿶竊뚩�訝뷴츆熬ヤ엶�밥틙竊뚦뭉訝붷룾餓η뵪�θ쫮�� linkgit:git-config[1] �� linkgit:gitmodules[5] 訝� '恙썹븼' �됮」�꾥�營��귛퐪鵝욜뵪 \"untracked\" �띰펽壤볟춴與▼쓼�ゅ똿�ユ쑋瓮잒릉�꾢냵若방뿶竊뚦츆餓т툖鴉싪˙溫ㅴ맏��쐣�밧뒯�꾬펷鵝녶츆餓т퍖�뜸폏熬ユ돧�뤸삸��쐣熬ヤ엶�밭쉪�끻�竊됥�귚슴�� \"dirty\" 鴉싧옙�ζ��됧�耶먩Æ�쀥램鵝쒏젒�꾡엶�뱄펽�ゆ쐣耶섇궓�ⓧ툓瀛㏝」��릎�꾣룓雅ㅷ쉪岳�뵻�띴폏熬ユ샑鹽뷴눣�ο펷瓦숁삸��1.7.0阿뗥뎺�꾥죱訝븝펹�귚슴�� \"all\" 鴉싮쉺�뤸��됧�耶먩Æ�쀧쉪岳�뵻��"
 
 #. type: Labeled list
-#: en/diff-options.txt:825
+#: en/diff-options.txt:831
 #, fuzzy, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr "--src-prefix=<prefix>"
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, fuzzy, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr "�양ㅊ瀯쇿츣�꾣틦�띸��뚥툖�� \"a/\"��"
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, fuzzy, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr "--dst-prefix=<prefix>"
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, fuzzy, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr " \"b/\""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr "訝띷샑鹽뷰뻣鵝뺞틦�뽫쎅�꾢뎺煐���"
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, fuzzy, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr "--line-prefix=<prefix>"
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr "�ⓩ캀訝�烏뚩풏�뷴뎺�졽툓訝�訝ら쥫鸚뽫쉪�띸���"
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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 "容섋��끻넻訝뗰펽�싪퓝 \"git add -N\" 曆삣뒥�꾣씉��쑉 \"git diff\" 訝�샑鹽뷰맏�경쐣�꾤㈉�뉏뻑竊뚦쑉 \"git diff --cached\" 訝�샑鹽뷰맏�경뻼餓뜰�귟퓳訝ら�됮」鵝욕풓�←쎅�� \"git diff\" 訝�샑鹽뷰맏訝�訝ゆ뼭�뉏뻑竊뚩�뚦쑉 \"git diff --cached\" 訝�샑鹽뷰맏訝띶춼�①쉪�뉏뻑�귟퓳訝ら�됮」��빳�� `--ita-visible-in-index` �θ퓲�잆�귟퓳訝ㅴ릉�됮」�썸삸瑥뺡챿�㎫쉪竊뚦컛�ε룾�썰폏熬ュ닠�ㅳ��"
 
 #. type: Plain text
-#: en/diff-options.txt:846
+#: en/diff-options.txt:852
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr "�념틢瓦쇾틳躍며뵪�됮」�꾣쎍鸚싪㎗�딉펽瑥룟뢿鰲� linkgit:gitdiffcore[7]��"
 
 #. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5847,55 +5862,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
+#, priority:220
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5903,397 +5936,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, fuzzy, no-wrap, priority:260
 msgid "-P"
 msgstr "-P"
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, fuzzy, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr "--refmap=<refspec>"
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, fuzzy, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr "--recurse-submodules[=yes|on-demand|no]"
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, fuzzy, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr "--jobs=<n>"
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, fuzzy, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr "--submodule-prefix=<path>"
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, fuzzy, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr "--recurse-submodules-default=[yes|on-demand]"
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr "--upload-pack <upload-pack>"
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "瑥�퍏�ε퓱��"
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr "-o <�됮」>"
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<�됮」>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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 "鵝욜뵪�뤺��덃쑍2瓦쏂죱�싦에�띰펽弱녺퍢若싩쉪耶쀧Е訝꿜폖渦볟댆�띶뒦�ⓦ�귞퍢若싩쉪耶쀧Е訝꿜툖孃쀥똿�첥UL�뻃F耶쀧Е�귝쐨�▼솳野방쐨�▼솳�됮」竊덂똿�ф쑋�ι�됮」竊됬쉪鸚꾤릤��룚�념틢�띶뒦�ⓦ�귛퐪瀯쇿눣鸚싦릉`--server-option = <option>`�띰펽若껂뺄�썸뙃�㎩뫝餓ㅸ죱訝�닓�븀쉪窈뷴틣�묌�곩댆�╊�塋���"
 
 #. type: Labeled list
-#: en/fetch-options.txt:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6381,13 +6414,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "瑥룟뢿�� linkgit:git-commit[1] 雅녻㎗弱녶냵若방렌�졾댆�먧벡�꾢끀餓뽪쎘餓ｆ뼶力뺛��"
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "�됮」"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr "<pathspec>..."
@@ -6417,7 +6450,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr "�곮�曆삣뒥藥꿱˙恙썹븼�꾣뻼餓뜰��"
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6447,13 +6480,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr "瓦쇿룾餓ζ쐣�덂쑑瓦먫죱 `add --interactive`竊뚥퐜��폏瀯뺠퓝�앭쭓�썰빱�쒎뜒竊뚩�뚨쎍�θ럼饔у댆 `patch` 耶먨뫝餓ㅳ�귝쐣�녘�瀯녵에��펽瑥룟뢿鰲�``雅ㅴ틨與▼폀''��"
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6627,31 +6660,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr "�띶넍曆삣뒥�뉏뻑�꾢룾�㎬죱鵝띲�귛룾�㎬죱鵝띴퍎�①뇨凉뺜릎�닸뵻竊뚨즯�섆툓�꾣뻼餓뜸퓷�곦툖�섅��"
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, fuzzy, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr "Pathspec�� `<file>` 訝�폖�믭펽�뚥툖��쑉�썰빱烏뚦뢿�겻릎鴉좈�믡�귛쫩�� `<file>` 閭ｅ��� `-`竊뚦닕鵝욜뵪�뉐뇛渦볟뀯�괦athspec �껆킔�� LF �� CR/LF �녽슂�귛룾餓ε폊�③뀓營�룜�� `core.quotePath` �� Pathspec �껆킔竊덅��귟쭅 linkgit:git config[1]竊됥�귛룱瑥룟뢿鰲� `--pathspec-file-nul `�뚦뀲掠� `--literal-pathspecs`��"
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, fuzzy, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr "�ゆ쐣�ⓧ슴�� `--pathspec-from-file` �뜻뎺�됪꼷阿됥�귝뙁若싪러孃꾢뀇榮좂뵪 NUL 耶쀧Е�녽슂竊뚧��됧끀餓뽩춻寧�꺗�됧춻�€꼷�앾펷�끾떖��죱寧�뭽凉뺝뤇竊됭〃鹽뷩��"
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, fuzzy, no-wrap, priority:300
 msgid "\\--"
 msgstr "\\--"
@@ -6663,7 +6696,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr "閭ㅹ�됮」��뵪雅롥늽獵삣뫝餓ㅸ죱�됮」�뚧뻼餓뜹닓烏⑨펷壤볠뻼餓뜹릫��꺗熬ヨ�溫ㅴ맏�썰빱烏뚪�됮」�띌씆躍멩쐣�⑨펹��"
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, fuzzy, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "若욂풃"
@@ -6956,8 +6989,8 @@ msgstr "�좈솮�꾢냵若�"
 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:379
 #, fuzzy, no-wrap, priority:300
 msgid "modified content"
@@ -7042,7 +7075,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr "岳�뵻訝듾툔�뉑닑�좈솮烏뚨쉪�끻�"
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, fuzzy, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "�귟쭅"
@@ -7054,13 +7087,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, fuzzy, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, fuzzy, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "linkgit:git[1] 瀯꾡뻑�꾡��ⓨ늽"
@@ -7498,7 +7531,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, fuzzy, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr "溫②�"
@@ -7710,7 +7743,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -8010,7 +8043,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr "�띸쉰"
@@ -8280,7 +8313,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8419,7 +8452,7 @@ msgid "zip"
 msgstr "�들걻����"
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9853,7 +9886,22 @@ msgid ""
 "'git branch' (-c | -C) [<oldbranch>] <newbranch>\n"
 "'git branch' (-d | -D) [-r] <branchname>...\n"
 "'git branch' --edit-description [<branchname>]\n"
-msgstr "'git branch' [--color[=<when>] |--no-color] [--show-current]\n\t[-v [--abbrev=<n> |--no-abbrev] ]\n\t[--column[=<options>] | --no-column][--sort=<key>]\n\t[--�덂뭉 [<commit>]][--no-merged [<commit>]]��\n\t[--�끻맜[<commit>]][--no-contains [<commit>]] [--contains [<commit>]]\n\t[--points-at <object>] [--format=<format>]��\n\t[(-r | --remotes) | (-a | --all)\n\t[--�쀨〃] [<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'git branch' (-m | -M) [<oldbranch>] <newbranch>\n'git branch' (-c | -C) [<oldbranch>] <newbranch>\n'git branch' (-d | -D) [-r] <branchname>...\n'git branch' --edit-description [<branchname>])\n"
+msgstr ""
+"'git branch' [--color[=<when>] |--no-color] [--show-current]\n"
+"\t[-v [--abbrev=<n> |--no-abbrev] ]\n"
+"\t[--column[=<options>] | --no-column][--sort=<key>]\n"
+"\t[--�덂뭉 [<commit>]][--no-merged [<commit>]]��\n"
+"\t[--�끻맜[<commit>]][--no-contains [<commit>]] [--contains [<commit>]]\n"
+"\t[--points-at <object>] [--format=<format>]��\n"
+"\t[(-r | --remotes) | (-a | --all)\n"
+"\t[--�쀨〃] [<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"
+"'git branch' (-m | -M) [<oldbranch>] <newbranch>\n"
+"'git branch' (-c | -C) [<oldbranch>] <newbranch>\n"
+"'git branch' (-d | -D) [-r] <branchname>...\n"
+"'git branch' --edit-description [<branchname>])\n"
 
 #. type: Plain text
 #: en/git-branch.txt:36
@@ -10361,7 +10409,11 @@ msgid ""
 "$ cd my2.6\n"
 "$ git branch my2.6.14 v2.6.14   <1>\n"
 "$ git switch my2.6.14\n"
-msgstr "$ 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 switch my2.6.14\n"
+msgstr ""
+"$ 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 switch my2.6.14\n"
 
 #. type: Plain text
 #: en/git-branch.txt:321
@@ -12448,7 +12500,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12832,7 +12884,7 @@ msgid "Limits the paths affected by the operation."
 msgstr "�먨댍�쀦뱧鵝쒎쉽�띸쉪瓮�푶��"
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr "�닷쩀瀯녻뒄瑥룟뢿鰲� linkgit:gitglossary[7] 訝�쉪 '瓮�푶鰲꾥똽' �←쎅��"
@@ -14316,7 +14368,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr "�싪퓝�� `refs / remotes / origin` 訝뗥닗兩뷴�瓦쒐쮮�녷뵱鸚당쉪凉뺟뵪竊뚦뭉�싪퓝�앭쭓�� `remote.origin.url` �� `remote.origin.fetch` �띸쉰�섌뇧�ε닗兩뷸�容섋��띸쉰��"
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -15143,7 +15195,7 @@ msgid "Discussion"
 msgstr "溫②�"
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, fuzzy, no-wrap, priority:280
 msgid "FILES"
 msgstr "�뉏뻑"
@@ -15255,8 +15307,9 @@ msgstr "�딂칹�썰빱�ゅ뒯�뜻��뽩럴瀯뤺˙岳�뵻�뚦닠�ㅷ쉪�뉏뻑竊뚥퐜鵝졿깹
 
 #. type: Plain text
 #: en/git-commit.txt:78
-#, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+#, fuzzy, priority:280
+#| msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr "鵝욜뵪雅ㅴ틨凉뤺‥訝곲�됪떓�뚪씊�ι�됪떓誤곫룓雅ㅷ쉪岳�뵻�귟��낁쭅 linkgit:git-add[1]��"
 
 #. type: Labeled list
@@ -15386,7 +15439,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr "�ⓨ걳亮꿱퓧烏뚨쉪�뜹�숋펽誤곫뒍渦볟눣瀯볠옖餓ε룾�룟솳�꾣졏凉뤹퍢�뷩�귟�鰲� linkgit:git-status[1]�귝꼷�녕� `--亮꿱퓧烏�`��"
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15398,7 +15451,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr "壤볟걳亮꿱퓧烏뚧뿶竊뚥빳�욘졏凉뤹퍢�븃풏�뷩��  �뤷뫑��\"--亮꿱퓧烏�\"��"
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -16133,557 +16186,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, fuzzy, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr "--get-urlmatch name URL"
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, fuzzy, no-wrap, priority:100
 msgid "--file config-file"
 msgstr "--file config-file"
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, fuzzy, no-wrap, priority:100
 msgid "--blob blob"
 msgstr "--blob blob"
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, fuzzy, no-wrap, priority:100
 msgid "--type <type>"
 msgstr "--type <type>"
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, fuzzy, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, fuzzy, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr "--get-colorbool name [stdout-is-tty]"
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, fuzzy, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr "--get-color name [default]"
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, fuzzy, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr "$(prefix)/etc/gitconfig"
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, fuzzy, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr "$XDG_CONFIG_HOME/git/config"
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, fuzzy, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr "~/.gitconfig"
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, fuzzy, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr "$GIT_DIR/config.worktree"
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, fuzzy, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr "��쥊"
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16746,14 +16793,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16764,7 +16823,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16774,7 +16833,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16784,7 +16843,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16794,7 +16853,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16806,157 +16865,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, fuzzy, 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:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, fuzzy, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, fuzzy, 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:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, fuzzy, 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:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, fuzzy, priority:100
 msgid "or"
 msgstr "��"
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, fuzzy, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr "% git config core.filemode\n"
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, fuzzy, 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:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, fuzzy, 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:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, fuzzy, 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:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, fuzzy, 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:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, fuzzy, 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:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, fuzzy, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, fuzzy, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16970,13 +17029,13 @@ msgstr ""
 "echo \"${WS}your whitespace color or blue reverse${RESET}\"\n"
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16989,19 +17048,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, fuzzy, no-wrap, priority:280
 msgid "BUGS"
 msgstr "�숃�"
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, fuzzy, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -17011,13 +17070,13 @@ msgstr ""
 "    key = value1\n"
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19609,7 +19668,10 @@ msgid ""
 "'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]\n"
 "'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]\n"
 "'git describe' <blob>\n"
-msgstr "'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]\n'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>] ��\n'git describe' <blob\n"
+msgstr ""
+"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]\n"
+"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>] ��\n"
+"'git describe' <blob\n"
 
 #. type: Plain text
 #: en/git-describe.txt:24
@@ -19684,103 +19746,104 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr "訝롥끀野삥돻�먧벡�띸쉪�뉒�竊뚥툖倻귛��얏룓雅ㅵ릮�꾣젃嶺억펽餓롨�뚦똿�ヨ��뉒���  �ゅ뒯�쀧ㅊ--�뉒���"
 
 #. type: Plain text
-#: en/git-describe.txt:70
-#, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+#: en/git-describe.txt:71
+#, fuzzy, priority:260
+#| msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr "訝띹쫨鵝욜뵪容섋���7鵝띶뛻��퓵�뜻빊耶쀤퐳訝뷴�穩▼릫燁곁쉪煐⒴넍竊뚩�뚧삸鵝욜뵪<n>鵝랃펽�뽬�끾졊���誤곦슴�ⓨ쩀弱묇퐤�ε숱�먧�訝ょ떖�밭쉪野배괌�띸㎞��  <n>訝�0弱녷뒔�띌빣�쇔폀竊뚦룵�양ㅊ���θ퓩�꾣젃嶺얇��"
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, fuzzy, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr "--candidates=<n>"
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr "訝롥끀�よ�껇솑�ⓩ�瓦묊쉪10訝ゆ젃嶺얏씎�뤺염渦볟뀯�꼊ommit-ish竊뚥툖倻귟�껇솑��鸚�<n>訝ゅ�숅�됦볶��  弱�<n>罌욃뒥��10餓δ툓鴉싪뒻兀방쎍�욜쉪�띌뿴竊뚥퐜��꺗鴉싦벨�잋�訝ゆ쎍�녺‘�꾤퍜�쒌��  <n>訝�0弱녶��닷룵渦볟눣若뚦뀲�백뀓�꾤퍜�쒌��"
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr "�よ풏�뷴츑�ⓨ뙶�띸쉪�끻�竊덁�訝ゆ젃嶺양쎍�ε폊�ⓩ��먧풘�꾣룓雅ㅿ펹��  瓦숁삸 --candidates=0 �꾢릪阿됭칾��"
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr "餓η쿁�η쉪�밧폀�묉젃�녽뵗瑥�샑鹽뷸��ⓧ슴�①쉪�쒐뇨嶺뽫븼�꾡에����  �뉒��띸㎞餓띶컛熬ユ돀�겼댆�뉐뇛渦볟눣��"
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 "�삥삸渦볟눣�욘졏凉륅펷�뉒��곫룓雅ㅶ빊�뤷뭽�먧벡�띸㎞�꾤섄�숋펹竊뚦뜵鵝욕츆訝롣�訝ゆ젃嶺양쎑�백뀓��  壤볞퐷�녑쑉 \"describe \"渦볟눣訝�쐦�경룓雅ㅵ�穩←쉪�ⓨ늽�띸㎞�띰펽瓦쇿푽�됬뵪竊뚦뜵鵝욜쎑�녕쉪�먧벡�겼����訝ゆ쐣�뉒��꾤뎵�с��  若껂툖鴉싧룵�묈눣�뉒��띸㎞竊뚩�뚧삸弱녻퓳�루쉪�먧벡�뤺염訝틍1.2-0-gdeadbee竊덃젃嶺푬1.2�롧쉪寧�0轝→룓雅ㅿ펽�뉐릲野배괌deadbee....竊됥��"
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, fuzzy, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr " <>"
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr "�よ�껇솑訝롧퍢若싩쉪 `glob(7)` 與▼폀�백뀓�꾣젃嶺억펽訝띶똿�� \"refs/tags/\" �띸��귛쫩�쒎뭽`--all`訝�壅룝슴�⑨펽若껂튋鴉싪�껇솑�백뀓瑥ζÆ凉뤹쉪�у쑑�녷뵱�뚩퓶葉뗨퇎甕ゅ폊�⑨펽�녶닽�믧솮 \"refs/heads/\"�� \"refs/remotes/\"�띸�竊쎾끀餓뽫굳�뗧쉪凉뺟뵪麗멱퓶訝띴폏熬ヨ�껇솑�귛쫩�쒐퍢�뷴쩀轝∽펽弱녺㎝榮��訝ゆÆ凉뤷닓烏⑨펽�백뀓餓삡퐬與▼폀�꾣젃嶺얗꺗鴉싪˙�껇솑��  鵝욜뵪`--no-match`�ζ툍�ㅵ뭽�띸쉰與▼폀�쀨〃��"
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr "--�믧솮<pattern>��"
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr "訝띹�껇솑訝롧퍢若싩쉪 `glob(7)` 與▼폀�백뀓�꾣젃嶺억펽�믧솮 \"refs/tags/\"�띸��귛쫩�쒎뭽`--all`訝�壅룝슴�⑨펽阿잋툖�껇솑�백뀓與▼폀�꾣쑍�겼늽��뭽瓦쒐쮮瓮잒릉凉뺟뵪竊뚦늽�ユ럲�� \"refs/heads/\"�� \"refs/remotes/\"�띸�竊쎾끀餓뽫굳�뗧쉪凉뺟뵪餓롣툖�껇솑�귛쫩�쒐퍢若싧쩀轝∽펽弱녺㎝榮��訝ゆÆ凉뤷닓烏⑨펽�백뀓餓삡퐬與▼폀�꾣젃嶺얍컛熬ユ럲�ㅳ�귛퐪訝�--match瀯볟릦�띰펽壤볞�訝ゆ젃嶺얕눛弱묈뙶�띴�訝�--match與▼폀訝붶툖�백뀓餓삡퐬--exclude與▼폀�띰펽弱녻˙�껇솑�귚슴��`--no-exclude`�ζ툍�ㅵ뭽�띸쉰與▼폀�쀨〃��"
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr "�양ㅊ���煐⒴넍�꾣룓雅ㅵ�穩▽퐳訝뷴릮鸚뉎��"
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr "�①쐦�겼릦亮뜻룓雅ㅶ뿶竊뚦룵瓮잓쉹寧т�訝ょ댍�먧벡��  壤볞퐷躍뚧쐹訝띶뙶�띸쎅�뉑룓雅ㅵ럣�꿜릎�덂뭉�꾢늽��툓�꾣젃嶺얏뿶竊뚩퓳孃덃쐣�ⓦ��"
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr "�쮏it.git壤볟뎺�묋퓳�루쉪訝쒑�竊뚧닊孃쀥댆雅녴��"
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, fuzzy, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19790,25 +19853,26 @@ msgstr ""
 "\tv1.0.4-14-g2414721\n"
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr "阿잌갚���竊뚧닊�� \"�� \"�녷뵱�꾢퐪�띶ㅄ�ⓩ삸�뷰틢v1.0.4�꾬펽鵝녺뵳雅롥츆�ⓩ��븀�訝딀쐣訝�雅쎿룓雅ㅿ펽��餓쩮escribe�ⓩ��롦렌�졽틙窯앭쨼�꾣룓雅ㅶ빊�륅펷\"14\"竊됧뭽�먧벡�ц벴�꾤섄�쇿�穩▼릫燁곤펷\"2414721\"竊됥��"
 
 #. 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\" + 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."
+#: en/git-describe.txt:151
+#, fuzzy, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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 "窯앭쨼�먧벡�꾣빊�뤸삸 \"git log v1.0.4...parent \"���썸샑鹽븀쉪�먧벡�꾣빊�뤵��  �덂툕�롧���\"-g \"+ parent�꾣룓鹽뷸룓雅ㅷ쉪�롧‘煐⒴넍竊덂뜵`2414721b194453f058079d897d13c4e377f92dc6`竊됥��  �띸� \"g \"餓ｈ〃 \"git\"竊뚨뵪雅롦룒瓦계쉴餓띄쉪�덃쑍竊뚦룚�념틢饔�뻑嶸←릤�껾CM�귟퓳�ⓧ볶餓у룾�썰슴�ⓧ툖�똕CM�꾤렞罌껂릎孃덃쐣�ⓦ��"
 
 #. type: Plain text
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr "野밥�訝ゆ젃嶺얍릫�� \"git describe\"竊뚦룵鴉싨샑鹽뷸젃嶺얍릫��"
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, fuzzy, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19818,13 +19882,13 @@ msgstr ""
 "\tv1.0.4\n"
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr "鵝욜뵪--all竊뚦뫝餓ㅵ룾餓δ슴�ⓨ늽��ㅄ鵝쒍맏�귟�껓펽��餓θ풏�뷰튋鴉싨샑鹽뷴뢿�껇러孃꾠��"
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, fuzzy, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19834,7 +19898,7 @@ msgstr ""
 "\ttags/v1.0.0-21-g975b\n"
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, fuzzy, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19844,13 +19908,13 @@ msgstr ""
 "\theads/lt/describe-7-g975b\n"
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr "��--abbrev溫양쉰訝�0�꾣깄�듕툔竊뚩��썰빱��빳�ⓩ씎野삥돻���θ퓩�꾣깹�됦뻣鵝뺝릮煐��꼝agname��"
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, fuzzy, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19860,37 +19924,37 @@ msgstr ""
 "\ttags/v1.0.0\n"
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr "瑥룡낏�륅펽倻귝옖鵝졽퍓鸚⑵풏�θ퓳雅쎾뫝餓ㅿ펽孃쀥댆�꾢릮煐���꺗驪붶툓�줝inus瓦먫죱瓦쇾틳�썰빱�띄쐦�곁쉪誤곲빣竊뚦썱訝뷰퐷�껯it餓볟틩��꺗�됪뼭�꾣룓雅ㅿ펽�뜹�穩▼릫燁겻빳975b凉�鸚댐펽�뚩퓳雅쎿룓雅ㅵ쑉壤볠뿶亮뜸툖耶섇쑉竊뚥퍎��\"-g975b \"�롧���꺗瓦섆툖擁념빳�뷴늽瓦쇾틳�먧벡��"
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr "�쒐뇨嶺뽫븼"
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr "野밥틢�먧풘�꾣캀訝ゆ룓雅ㅿ펽'git describe'弱녽쫿�덂��얌�訝ゆ젃嶺억펽瑥ζ젃嶺얏�����먧벡�꾣젃嶺얇��  �됪낏�딁쉪�뉒��삥삸驪붻슥�뤹벨�꾣젃嶺얏쎍�쀦Б瓦롳펽�ζ쐿渦껅뼭�꾣젃嶺얏�삥삸驪붹뿥�잒푵�곭쉪�뉒��닷룛轝�퓥��  倻귝옖�얍댆訝�訝ゅ츑�ⓨ뙶�띸쉪�뉒�竊뚦츆�꾢릫耶쀥갚鴉싪˙渦볟눣竊뚧맂榮℡갚鴉싧걶閭㏂��"
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr "倻귝옖亦→쐣�얍댆若뚦뀲�백뀓�꾬펽'git describe'鴉싧썮繹�룓雅ㅵ럣�뀐펽�얍댆訝�訝ゅ럴瀯뤺˙�뉓��꾤쪝�덃룓雅ㅳ��  瑥η쪝�덄쉪�뉒�弱녵툗渦볟뀯�꾣룓雅ㅷ쉪SHA-1�꾤섄�쇾�壅룩˙渦볟눣�귛쫩�쒏뙁若싦틙 `--first-parent`竊뚪궍阿덂썮繹�컛�よ�껇솑驪뤶릉�먧벡�꾤К訝�訝ょ댍瀛㎯��"
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr "倻귝옖�②죱壅계퓝葉뗤릎�묊렟雅녶쩀訝ゆ젃嶺억펽�ｄ퉰弱녽�됪떓訝롨풏�η쉪commit-ish�멨량��弱묊쉪�뉒�亮띈풏�뷩��  瓦숅뇤竊뚧�弱뤹쉪�먧벡藥�펰熬ュ츣阿됦맏 \"git log tag...input \"���양ㅊ�꾣룓雅ㅶ빊�뤷컛���弱뤹쉪�먧벡�곈뇧��"
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr "�묈�穩▽빳�듾툖�뉐릲�먧벡�꾣젃嶺얍�穩∽펽訝띹꺗熬ユ룒瓦겹��  �ⓩ룒瓦캼lob�띰펽�뉐릲blob�꾥슥�뤹벨�뉒�鴉싪˙恙썹븼竊뚥퐜弱썹�饔삯뇧瀛㎪젃嶺얏삸�됧닶�꾬펽blob餓띸꽫熬ユ룒瓦겻맏<committ-ish>:<path>��"
@@ -19920,19 +19984,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr "-1 --�뷴쑑"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, fuzzy, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr "-2 --ours"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, fuzzy, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr "-3 --theirs"
@@ -20523,7 +20587,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr "<瓮�푶>..."
@@ -20658,7 +20722,13 @@ msgid ""
 "'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
-msgstr "'git diff' [<options>] [<commit>] [--] [<path>...]��\n'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]��\n'git diff' [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n'git diff' [<options>] <commit>...<commit> [--] [<path>...]��\n'git diff' [<options>] <blob> <blob\n'git diff' [<options>] --no-index [--] <path> <path>��\n"
+msgstr ""
+"'git diff' [<options>] [<commit>] [--] [<path>...]��\n"
+"'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]��\n"
+"'git diff' [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]��\n"
+"'git diff' [<options>] <blob> <blob\n"
+"'git diff' [<options>] --no-index [--] <path> <path>��\n"
 
 #. type: Plain text
 #: en/git-diff.txt:25
@@ -20704,15 +20774,16 @@ msgstr "瓦쇾릉烏ⓨ뜒��뵪�ζ윥�뗤퐷訝뷰툔訝�轝→룓雅ㅶ��싩쉪�멨�雅�<commi
 
 #. type: Plain text
 #: en/git-diff.txt:56
-#, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+#, fuzzy, priority:280
+#| msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr "倻귝옖瀯쇿눣雅� --merge-base竊뚦닕訝띴슴��<commit>竊뚩�뚥슴��<commit>�똇EAD�꾢릦亮뜹읃�겹��  `git diff --merge-base A`嶺됧릪雅�`git diff $(git merge-base A HEAD)`��"
 
 #. type: Labeled list
 #: en/git-diff.txt:57
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
-msgstr "'git diff' [<options>] <commit> [--] [<path>...] ��"
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
+msgstr "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 
 #. type: Plain text
 #: en/git-diff.txt:64
@@ -20720,110 +20791,116 @@ msgstr "'git diff' [<options>] <commit> [--] [<path>...] ��"
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr "瓦쇾릉烏ⓩ졏��뵪�ζ윥�뗤퐷�꾢램鵝쒏젒訝�쎑野밥틢�썲릫訝�<commit>�꾡엶�밤��  �ⓨ룾餓δ슴�� HEAD �δ툗���곁쉪�먧벡瓦쏂죱驪붻푵竊뚧닑�끺슴�ⓨ늽��릫燁경씎訝롣툖�뚦늽��쉪窈띄ク瓦쏂죱驪붻푵��"
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr "倻귝옖瀯쇿눣雅� --merge-base竊뚦닕訝띴슴��<commit>竊뚩�뚥슴��<commit>�똇EAD�꾢릦亮뜹읃�겹��  `git diff --merge-base A`嶺됧릪雅�`git diff $(git merge-base A HEAD)`��"
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr "瓦숁삸訝뷰틙�η쐦訝ㅴ릉餓삥꼷<commit>阿뗩뿴�꾢룜�뽧��"
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr "倻귝옖瀯쇿눣雅� --merge-base竊뚦닕鵝욜뵪訝ㅴ릉�먧벡�꾢릦亮뜹읃簾�鵝쒍맏 \"阿뗥뎺 \"�꾡��밤��  `git diff --merge-base A B`嶺됧릪雅�`git diff $(git merge-base A B) B`��"
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr "瓦쇾릉烏ⓨ뜒��뵪�ζ윥�뗥릦亮뜻룓雅ㅷ쉪瀯볠옖��  寧т�訝ゅ닓�븀쉪<commit>恙낂』��릦亮뜻쑍翁ワ폑�뜸퐰訝ㅴ릉�뽪쎍鸚싩쉪�먧벡佯붻���끀�띈푽��  訝�訝ゆ뼶堊욜쉪�방퀡��슴��`^@`�롧��δ벨�잍����꾡엶溫�썓��  堊뗥쫩竊뚦쫩��`master`�썲릫雅녵�訝ゅ릦亮뜻룓雅ㅿ펽`git diff master master^@`瀯쇿눣�꾢릦亮뜹량凉귚툗`git show master`�멨릪��"
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr "瓦쇾툗�⒵쐿�꾢숱凉륅펷亦→쐣`.`竊됪삸�뚥퉱�꾬펽�ⓧ틢�η쐦訝ㅴ릉餓삥꼷<commit>阿뗩뿴�꾢룜�뽧��  倻귝옖�곭븼雅녵�堊㎫쉪<commit>竊뚦컛雅㎫뵟訝롣슴�쭴EAD�멨릪�꾣븞�쒌��"
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 "瓦숂쭕壤℡폀��맏雅녷윥�뗥똿�ュ뭽�닷댆寧т틠訝�<commit>�꾢늽��툓�꾢룜�뽳펽餓롣륵訝�<commit>�꾢뀻�뚨쪝�덂�冶뗣��  `git diff A...B`嶺됧릪雅�`git diff $(git merge-base A B) B`��  鵝졾룾餓η쐛��<commit>訝�쉪餓삡퐬訝�訝わ펽瓦쇾툗鵝욜뵪HEAD�꾣븞�쒐쎑�뚣��"
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr "訝뷰틙�꿩�鵝졾걳訝�雅쎾쪍�ょ쉪雅뗦깄竊뚦틪瑥ζ낏�뤷댆竊뚪솮雅�`--merge-base`�꾣깄�드뭽���롣륵燁띴슴��`...`寧�뤇�꾢숱凉륅펽訝딂염�뤺염訝�쉪����<commit>�썲룾餓ζ삸餓삡퐬<tree>��"
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 "�념틢<commit>�꾣쎍若뚧빐�꾣떬�숁뼶凉륅펽鰲걄inkgit:gitrevisions[7]訝�쉪 \"SPECIFYING REVISIONS \"�ⓨ늽��  �띈�뚳펽\"diff \"��뀽雅롦캈渦껂륵訝�_塋�궧竊뚩�뚥툖��똽�댐펽�뚥툝�껃쎍寧�뤇竊�`<commit>...<commit>`��`<commit>...<commit>`竊됧뭉訝띷꼷�녕�linkgit:gitrevisions[7]訝� \"SPECIFYING RANGES \"�ⓨ늽��若싦퉱�꾥똽�담��"
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, fuzzy, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr "'git diff' [<options>] <blob> <blob>"
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr "瓦숂쭕壤℡폀��맏雅녷윥�뗤륵訝챐lob野배괌�꾢렅冶뗥냵若밥퉳�당쉪藥�펰��"
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr "弱녶램鵝쒏젒訝� \"�븀� \"�덃쑍竊덆샄餘�#1竊됥��\"�묇뺄�꾢늽��\"竊덆샄餘�#2竊됪닑 \"餓뽨뺄�꾢늽��\"竊덆샄餘�#3竊됭퓵烏뚧캈渦껁��  榮℡폊�ゅ��ゅ릦亮띄쉪�←쎅�끻맜瓦쇾틳�뜻�竊뚦뜵�②㎗�녑넳囹곫뿶��  瑥�퍏�끻넻鰲� linkgit:git-read-tree[1] \"3-Way Merge\" �ⓨ늽��"
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr "�곭븼�ゅ릦亮띄쉪�←쎅�꾢량凉귟풏�븝펽�ゆ샑鹽� \"Unmerged\"��  �よ꺗�ⓩ캈渦껃램鵝쒏젒�뚨뇨凉뺟쉪�뜹�쇾슴�ⓦ��"
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr "<paths>�귝빊竊뚦퐪瀯쇿눣�띰펽�ⓧ틢弱냗iff�먨댍�ⓩ뙁若싩쉪瓮�푶訝딉펷鵝졾룾餓η퍢�븀쎅壤뺝릫燁곤펽亮띈렩孃쀥끀訝뗦��됪뻼餓띄쉪diff竊됥��"
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr "汝��δ퐷�꾢램鵝쒏젒�꾢릢燁띷뼶力�"
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, fuzzy, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20835,64 +20912,67 @@ msgstr ""
 "$ git diff HEAD       <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr "藥δ퐳�묇툓�꾡엶�배퓲亦→쐣訝뷰툔訝�轝→룓雅ㅵ걳�뷴옯��"
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr "榮℡폊�뚥퐷���롣�轝→룓雅ㅴ퉳�당쉪�섇뙑竊쎾쫩�쒍퐷瓦먫죱`git commit`�뚥툖鵝욜뵪`-a`�됮」竊뚥퐷弱녵폏�먧벡�꾢냵若밤��"
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr "�や퐷訝딀А�먧벡�롥램鵝쒏젒訝딁쉪�섇뙑竊쎾쫩�쒍퐷瓦먫죱`git commit -a'竊뚥퐷弱녷룓雅ㅷ쉪�끻���"
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr "訝롣뻣�뤸룓雅ㅷ쉪驪붻푵"
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
 "$ git diff HEAD -- ./test  <2>\n"
 "$ git diff HEAD^ HEAD      <3>\n"
-msgstr "$ git diff test <1>\n$ git diff HEAD -- ./test <2>\n$ git diff HEAD^ HEAD <3>\n"
+msgstr ""
+"$ git diff test <1>\n"
+"$ git diff HEAD -- ./test <2>\n"
+"$ git diff HEAD^ HEAD <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr "訝띴슴�ⓨ퐪�띶늽��쉪窈띄ク竊뚩�뚧삸訝� \"役뗨캊 \"�녷뵱�꾦《塋�캈渦껁��"
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr "訝롥끀瑥닸삸訝� \"test \"�녷뵱�꾦《塋�캈渦껓펽訝띶쫩瑥닸삸訝롥퐪�띶늽��쉪窈띄ク驪붻푵竊뚥퐜�ら솏雅롣툗 \"test \"�뉏뻑驪붻푵��"
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr "驪붻푵訝딀А�먧벡�띸쉪�덃쑍�뚥툓轝→룓雅ㅷ쉪�덃쑍��"
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr "驪붻푵�녷뵱�뷸엫"
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20904,31 +20984,31 @@ msgstr ""
 "$ git diff topic...master  <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr "訝볣쥦�꾣룓鹽뷴뭽訝삣늽��퉳�당쉪�섇뙑��"
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, fuzzy, priority:280
 msgid "Same as above."
 msgstr "�뚥툓��"
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr "�や툜窯섇늽���冶뗤빳�ο펽�ⓧ말�녷뵱訝듿룕�잏쉪�섇뙑��"
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr "�먨댍藥�늽渦볟눣"
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, fuzzy, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20940,31 +21020,31 @@ msgstr ""
 "$ git diff arch/i386 include/asm-i386   <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr "�ゆ샑鹽뷰엶�밤�곲뇥�썲릫�뚦쨳�띰펽鵝녵툖�양ㅊ罌욃뒥�뽩닠�ㅳ��"
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr "�ゆ샑鹽뷴릫燁겼뭽�섇뙑�꾣�㎬뇽竊뚥퐜訝띷샑鹽뷴츩�끿쉪藥�펰渦볟눣��"
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr "弱냗iff渦볟눣�먨댍�ⓨ뫝�띸쉪耶먩젒訝듽��"
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr "饔㎩댍藥��잌솳渦볟눣"
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, fuzzy, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20974,19 +21054,19 @@ msgstr ""
 "$ git diff -R                          <2>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr "�김뉩窯앭쨼�꾢뫅�잍씎野삥돻�띶뫝�띲�곩쨳�뜹뭽若뚦뀲�띶넍竊덆씆躍멩쁻兀듸펹��"
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr "�띶릲渦볟눣藥��쇈��"
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -28278,7 +28358,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31791,373 +31871,374 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr "--獒낂Ⅰ[=��|��|�ゅ뒯|��]"
 
 #. type: Plain text
-#: en/git-log.txt:43
-#, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+#: en/git-log.txt:45
+#, fuzzy, priority:260
+#| msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr "�볟뜲�뷸샑鹽븀쉪餓삡퐬�먧벡�꾢뢿�껃릫燁겹�귛쫩�쒏뙁若싦틙'short'竊뚦컛訝띷돀�� ref name �꾢뎺煐�'refs/heads/'��'refs/tags/'��'refs/remotes/'�귛쫩�쒏뙁若�'full'竊뚦츑�당쉪�귟�껅뻼��릫燁곤펷�끾떖�띸�竊됧컛熬ユ돀�겹�귛쫩�쒏뙁若싦틙'auto'竊뚪궍阿덂쫩�쒑풏�뷴댆瀯덄ク竊뚦뢿�껅뻼��쉪�띸㎞弱녻˙�양ㅊ竊뚦갚�뤹퍢雅�'short'訝��뤄펽��닕訝띷샑鹽뷴뢿�껅뻼��쉪�띸㎞�귡퍡溫ㅹ�됮」��'short'��"
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, fuzzy, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr "--decorate-refs=<pattern>"
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, fuzzy, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr "--decorate-refs-exclude=<pattern>"
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr "倻귝옖亦→쐣瀯쇿츣`--decorate-refs`竊뚦갚�뉓즳���됬쉪�귟�껅뻼��꺗熬ュ똿�у쑉�끹��  野밥틢驪뤶릉�숅�됭�낉펽倻귝옖若껂툗`--decorate-refs-exclude`瀯쇿눣�꾡뻣鵝뺞Æ凉뤹쎑�백뀓竊뚧닑�끻츆訝�`--decorate-refs`瀯쇿눣�꾡뻣鵝뺞Æ凉뤶툖�백뀓竊뚦갚訝띹쫨弱녶끀�ⓧ틢獒낂Ⅰ��`log.excludeDecoration`�띸쉰�됮」�곮�餓롨즳耀겻릎�믧솮�귟�껅뻼��펽鵝녷삇簾�쉪`--decorate-refs`與▼폀弱녻쫮��`log.excludeDecoration`�꾢뙶�띲��"
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr "�볟뜲�뷴뫝餓ㅸ죱訝딁퍢�븀쉪驪뤶�轝→룓雅ㅶ�堊앮뜮�꾢뢿�껃릫燁겹��"
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr "鵝욜뵪 mailmap �뉏뻑弱녵퐳�끻뭽�먧벡�끿쉪�띶춻�뚨뵷耶먬궙餓뜹쑑���졾컙訝븃쭊�껆쉪�잌츩冶볟릫�뚨뵷耶먬궙餓뜹쑑���귛뢿鰲� linkgit:git-shortlog[1]��"
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 "亦→쐣瓦쇾릉�뉐퓱竊�`git log -p <path>...`鴉싨샑鹽븃㏄�딀뙁若싪러孃꾤쉪�먧벡竊뚥빳�듿뀽雅롧쎑�뚧뙁若싪러孃꾤쉪藥�펰��  �됦틙瓦쇾릉竊뚦갚鴉싨샑鹽븃㏄�딀뙁若싪러孃꾤쉪�먧벡�꾢뀲�ⓨ량凉귨폑瓦숁꼷�녕�\"<path>... \"�ら솏�뜻룓雅ㅿ펽�뚥툖�먨댍瓦쇾틳�먧벡�꾢량凉귙��"
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr "瑥룡낏�륅펽瓦쇿컛壤긷뱧���됧읃雅럅iff�꾥풏�븀굳�뗰펽堊뗥쫩�ｄ틳��`--stat`雅㎫뵟�꾥풏�뷩��"
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr "�ⓩ캀轝→룓雅ㅷ쉪渦볟눣訝�똿�т�烏�\"`�ε퓱鸚㎩컦<number>'\"竊뚦끀訝�<number>����먧벡岳→겘�꾦빣佯�펽�뺜퐤訝뷴춻�귙��  �ⓨ쑉�졾엮餓�`git log`渦볟눣訝���뽪뿥恙쀤에��쉪藥ε끁�꾦�잌벧竊뚦뀅溫멨츆餓ф룓�띶늽�띸㈉�담��"
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr "<岳���덅똽��>��"
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr "�ゆ샑鹽뷸뙁若싦엶溫�똽�닷냵�꾣룓雅ㅳ��  壤볠깹�됪뙁若�<岳���껃쎍>�띰펽容섋�訝�`HEAD`竊덂뜵野쇠눜壤볟뎺�먧벡�꾣빐訝ゅ럣�뀐펹��  `origin...HEAD`�뉐츣餓롥퐪�띷룓雅ㅿ펷��`HEAD`竊됧�冶뗧쉪���됪룓雅ㅿ펽鵝녵툖��퍗`origin`凉�冶뗣�귛뀽雅�<revision range>�꾢츑�닸떬�숁뼶凉륅펽瑥룟뢿鰲걄inkgit:gitrevisions[7]�� \"�뉐츣�껃쎍 \"�ⓨ늽��"
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr "[--] <瓮�푶>..."
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr "�ゆ샑鹽븅궍雅쏂떨餓θ㎗�딁Е�덃뙁若싪러孃꾤쉪�뉏뻑��쫩鵝뺝숱�먪쉪�먧벡��  �됧뀽瀯녻뒄�뚦끀餓뽫��뽪Æ凉륅펽瑥룟뢿鰲곦툔�®쉪'�녶뤁嶸���'��"
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr "壤볟눣�경렁曆녷뿶竊뚩러孃꾢룾�썽�誤곦빳`--`訝뷴뎺煐�竊뚥빳堊욕컛�뜸툗�됮」�뽨엶溫�똽�닷늽凉���"
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr "藥�펰�쇔폀��"
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr "容섋��끻넻訝뗰펽`git log`訝띴폏雅㎫뵟餓삡퐬藥�펰渦볟눣�귚툔�®쉪�됮」��빳�ⓩ씎�양ㅊ驪뤸А�먧벡���싩쉪岳�뵻��"
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr "力ⓩ꼷竊뚪솮�욄삇簾�퍢��`--diff-merges`�꾢룜鵝볩펷�끾떖��쉪`-m`竊�`-c`��`-cc`�됮」竊됵펽��닕�덂뭉�먧벡訝띴폏�양ㅊ藥�펰竊뚦뜵鵝욥�됪떓雅�`--patch`瓦숁졆�꾢량凉귝졏凉륅펽阿잋툖鴉싧뙶��`-S`瓦숁졆�꾣맂榮��됮」�귚풃鸚뽪깄�득삸壤�`--first-parent`熬ヤ슴�ⓩ뿶竊뚦쑉瓦숂쭕�끻넻訝뗰펽`first-parent`��퍡溫ㅶ졏凉뤵��"
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr "`git log --no-merges`��"
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr "�양ㅊ�답릉�먧벡�녶뤁竊뚥퐜瓮녘퓝餓삡퐬�덂뭉�끻�"
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, fuzzy, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr "`git log v2.6.12.. include/scsi drivers/scsi`"
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr "�양ㅊ�ょ뎵��'v2.6.12'餓ζ씎�밧룜`include/scsi`��`drivers/scsi`耶먪쎅壤뺜릎餓삡퐬�뉏뻑�꾣��됪룓雅ㅳ��"
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr "`git log --since=\"2 weeks ago\" -- gitk`��"
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr "�양ㅊ瓦뉐렮訝ㅵ뫅�끻��뉏뻑'gitk'�꾡엶�밤��  `--`��퓚誤곭쉪竊뚥빳�욕뀓訝롥릫訝�'gitk'��*�녷뵱�멩렁曆녴��"
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, fuzzy, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr "`git log --name-status release..test`"
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr "�양ㅊ�� \"test \"�녷뵱訝�퐜弱싨쑋�� \"release \"�녷뵱訝�쉪�먧벡竊뚥빳�딀캀訝ゆ룓雅ㅴ엶�밭쉪瓮�푶�쀨〃��"
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr "`git log --follow builtin/rev-list.c`��"
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr "�양ㅊ�밧룜`builtin/rev-list.c`�꾣룓雅ㅿ펽�끾떖�ｄ틳�ⓩ뻼餓띈˙壅뗤틛�겼쑉�띶춻阿뗥뎺�묊뵟�꾣룓雅ㅳ��"
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr "`git log --branches --not --remotes=origin`��"
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr "�양ㅊ���됧쑉�у쑑�녷뵱訝�퐜訝띶쑉 \"origin \"�꾥퓶葉뗨퇎甕ゅ늽��릎�꾣룓雅ㅿ펷鵝졿쐣�똮rigin亦→쐣�꾡툥蜈울펹��"
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr "`git log master --not --remotes=*/master`��"
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr "�양ㅊ���됧쑉�у쑑訝삣틩鵝녵툖�ⓧ뻣鵝뺠퓶葉뗤퍜佯볞말佯볟늽��릎�꾣룓雅ㅳ��"
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr "`git log -p -m -first-parent`��"
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr "�양ㅊ�끾떖�섇뙑藥�펰�꾢럣�뀐펽鵝녶룵餓� \"訝삣늽�� \"�꾥쭜佯�펽瓮녘퓝�θ눎�덂뭉�녷뵱�꾣룓雅ㅿ펽亮뜻샑鹽뷴릦亮뜹를�η쉪�③깿�섇뙑藥�펰��  瓦쇿룵�됧쑉�드쑵訝ζ졏�꾣붃嶺뽳펽�ⓨ걶�쇿쑉訝�訝ら썓�먨늽��뿶�덂뭉���됦말窯섇늽��뿶�띷쐣�뤶퉱��"
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr "`git log -L '/int main/',/^}/:main.c`��"
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr "�양ㅊ雅녷뻼餓�`main.c`訝�쉪�썸빊`main()`��쫩鵝뺡쉹�띌뿴轢붷룜�꾠��"
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr "`git log -3`"
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr "弱녷샑鹽븀쉪�먧벡�곈뇧�먨댍��3訝ゃ��"
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr "�멨퓘�섌뇧鰲� linkgit:git-config[1] 竊뚥툗 diff �잍닇�멨뀽�꾥�營�쭅 linkgit:git-diff[1] ��"
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr "`--format`�됮」�꾦퍡溫ㅵ�쇈��  (鰲곦툓�®쉪 \"轢귚벽�꾣졏凉�\"��)容섋�訝� \"訝�춬\"��"
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr "�양ㅊ�ε퓱�띈쫨鵝욜뵪�꾤폋�곥��  (鰲곦툓�®쉪 \"溫②�\"��)倻귝옖溫양쉰雅놅펽容섋�訝�`i18n.commitEncoding`�꾢�쇽펽��닕訝튧TF-8��"
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr "雅븀굳����ζ쐿�꾦퍡溫ㅶ졏凉뤵��  (驪붻푵`--date`�됮」��)容섋�訝� \"default\"竊뚦뜵�숁닇`Sat May 8 19:35:34 2010 -0500`瓦숁졆�꾣뿥�잆��"
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr "倻귝옖�쇔폀熬ヨ�營�맏 \"auto:foo\"竊뚦뭉訝붹��ⓧ슴�ⓨ뫜�ュ솳竊뚪궍阿덃졏凉� \"foo \"弱녻˙�ⓧ틢�ζ쐿�쇔폀�귛맔�쇿컛鵝욜뵪 \"容섋�\"��"
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr "倻귝옖`true`竊�`git log`弱녶깗鵝욜뵪`--follow`�됮」訝��뤄펽壤볡퍢�뷰�訝�<瓮�푶>�뜰��  瓦쇾툗`--follow`�됬쎑�뚨쉪�먨댍竊뚦뜵若껂툖�썹뵪雅롨퇎甕ゅ쩀訝ゆ뻼餓띰펽亮뜸툝�③씆瀛욘�㎩럣�꿜툓訝띹꺗孃덂��겼램鵝쒌��"
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr "倻귝옖`false`竊�`git log`�뚨쎑�녑뫝餓ㅵ컛訝띷뒍�앭쭓�먧벡鵝쒍맏訝�訝ゅㄷ�꾢닗兩뷰틟餓뜰��  `git log -p`渦볟눣訝�쉪餓삡퐬�방룓雅ㅹ꺗鴉싪˙�양ㅊ�뷸씎竊뚩�뚥툖�꾢뒥藥�펰��  容섋���`true`��"
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr "倻귝옖 \"true\"竊�\"git log \"�뚨쎑�녑뫝餓ㅵ컛��\"--�양ㅊ嶺얍릫 \"�됮」訝��룩죱雅뗣��"
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, fuzzy, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr "mailmap.*"
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, fuzzy, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr "See linkgit:git-shortlog[1]."
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr "寧붻�.displayRef"
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr "�ㅴ틙��`core.notesRef`��`GIT_NOTES_REF`溫양쉰�꾦퍡溫ㅵ�쇔쨼竊뚦쑉��`log`楹삣닓�썰빱�양ㅊ�먧벡岳→겘�띰펽瓦섋쫨餓롥벆雅쎾뢿�껅뻼��릎瑥삣룚力③뇢��  �귟쭅linkgit:git-notes[1]��"
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr "��빳���訝ら씆煐⒴넍�� ref �띸㎞�뽨�訝� glob竊뚦뭉訝붷룾餓ε쩀轝→뙁若싥��  野밥틢訝띶춼�①쉪�귟�껅뻼��컛�묈눣鈺�몜竊뚥퐜訝띶뙶�띴뻣鵝뺝뢿�껅뻼��쉪glob弱녻˙亦됮퍡�겼옙�γ��"
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr "瓦쇾릉溫양쉰��빳��`--no-notes`�됮」獵곭뵪竊뚨뵳`GIT_NOTES_DISPLAY_REF`��쥊�섌뇧誤녺썣竊뚦뭉��`--notes=<ref>`�됮」誤녺썣��"
@@ -34847,7 +34928,9 @@ msgstr "燁삣뒯�뽭뇥�썲릫訝�訝ゆ뻼餓뜰�곭쎅壤뺞닑寧�뤇�얏렏��"
 msgid ""
 " git mv [-v] [-f] [-n] [-k] <source> <destination>\n"
 " git mv [-v] [-f] [-n] [-k] <source> ... <destination directory>\n"
-msgstr " git mv [-v] [-f] [-n] [-k] <�ζ틦> <��쉪��>��\n git mv [-v] [-f] [-n] [-k] <source> ...<��쉪��>��퐬\n"
+msgstr ""
+" git mv [-v] [-f] [-n] [-k] <�ζ틦> <��쉪��>��\n"
+" git mv [-v] [-f] [-n] [-k] <source> ...<��쉪��>��퐬\n"
 
 #. type: Plain text
 #: en/git-mv.txt:25
@@ -35045,7 +35128,19 @@ msgid ""
 "'git notes' remove [--ignore-missing] [--stdin] [<object>...]\n"
 "'git notes' prune [-n] [-v]\n"
 "'git notes' get-ref\n"
-msgstr "'git notes' [list [<object>]]\n'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>] ��\n'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )\n'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n'git notes' edit [--allow-empty] [<object>])\n'git notes' �양ㅊ [<object>]\n'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>\n'git notes' merge --commit [-v | -q]\n'git notes' merge --abort [-v | -q]\n'git notes' remove [--ignore-missing] [--stdin] [<object>...]��\n'git notes' prune [-n] [-v]\n'git notes' get-ref\n"
+msgstr ""
+"'git notes' [list [<object>]]\n"
+"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>] ��\n"
+"'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )\n"
+"'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
+"'git notes' edit [--allow-empty] [<object>])\n"
+"'git notes' �양ㅊ [<object>]\n"
+"'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>\n"
+"'git notes' merge --commit [-v | -q]\n"
+"'git notes' merge --abort [-v | -q]\n"
+"'git notes' remove [--ignore-missing] [--stdin] [<object>...]��\n"
+"'git notes' prune [-n] [-v]\n"
+"'git notes' get-ref\n"
 
 #. type: Plain text
 #: en/git-notes.txt:29
@@ -35451,7 +35546,9 @@ msgstr ""
 msgid ""
 "Notes:\n"
 "    Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
-msgstr "力ⓩ꼷雅뗩」��\n    役뗨캊�낉폏 Johannes Sixt <j6t@kdbg.org>\n"
+msgstr ""
+"力ⓩ꼷雅뗩」��\n"
+"    役뗨캊�낉폏 Johannes Sixt <j6t@kdbg.org>\n"
 
 #. type: Plain text
 #: en/git-notes.txt:296
@@ -37346,7 +37443,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -37362,7 +37459,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, fuzzy, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr "--keep-pack=<pack-name>"
@@ -37566,7 +37663,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -37602,7 +37699,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37718,7 +37815,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -38273,9 +38370,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-pull.txt:121
-#, priority:220
-msgid "When false, merge the current branch into the upstream branch."
-msgstr ""
+#, fuzzy, priority:220
+msgid "When false, merge the upstream branch into the current branch."
+msgstr " quilt "
 
 #. type: Plain text
 #: en/git-pull.txt:123
@@ -38762,7 +38859,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43998,115 +44095,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, fuzzy, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr "--unpack-unreachable=<when>"
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -45143,7 +45240,9 @@ msgstr "麗멧퉭�ㅹ��먧벡"
 msgid ""
 "$ git commit ...\n"
 "$ git reset --hard HEAD~3   <1>\n"
-msgstr "$ git commit ...\n$ git reset --hard HEAD~3 <1>\n"
+msgstr ""
+"$ git commit ...\n"
+"$ git reset --hard HEAD~3 <1>\n"
 
 #. type: Plain text
 #: en/git-reset.txt:205
@@ -45170,7 +45269,16 @@ msgid ""
 "Updating from 41223... to 13134...\n"
 "Fast-forward\n"
 "$ git reset --hard ORIG_HEAD       <4>\n"
-msgstr "$ git pull <1>\n�ゅ뒯�덂뭉nitfol\nCONFLICT竊덂냵若뱄펹�굈itfol�꾢릦亮뜹넳囹�\n�ゅ뒯�덂뭉鸚김뇰竊쎽엶鸚띶넳囹곻펽�뜹릮�먧벡瀯볠옖��\n$ git reset --hard <2>\n$ git pull . topic/branch <3>\n餓�41223...�닸뼭��13134...\n恙ヨ퓵\n$ git reset --hard ORIG_HEAD <4>\n"
+msgstr ""
+"$ git pull <1>\n"
+"�ゅ뒯�덂뭉nitfol\n"
+"CONFLICT竊덂냵若뱄펹�굈itfol�꾢릦亮뜹넳囹�\n"
+"�ゅ뒯�덂뭉鸚김뇰竊쎽엶鸚띶넳囹곻펽�뜹릮�먧벡瀯볠옖��\n"
+"$ git reset --hard <2>\n"
+"$ git pull . topic/branch <3>\n"
+"餓�41223...�닸뼭��13134...\n"
+"恙ヨ퓵\n"
+"$ git reset --hard ORIG_HEAD <4>\n"
 
 #. type: Plain text
 #: en/git-reset.txt:223
@@ -45233,7 +45341,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr "�ⓩ��δ틙�덂뭉�꾤퍜�쒎릮竊뚥퐷��꺗鴉싧룕�겼룱訝�訝ゅ늽��쉪岳�뵻訝띶갹雅뷸꼷��  瓦먫죱`git reset --hard ORIG_HEAD`��빳溫⒳퐷�욃댆�잍씎�꾡퐤營�펽鵝녶츆鴉싦륭凉껂퐷�꾣쑍�겻엶�뱄펽瓦숁삸鵝졽툖�녘쫨�꾠��  `git reset --merge`鴉싦퓷�쇾퐷�꾣쑍�겻엶�밤��"
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr "訝�뼪�꾢램鵝쒏탛葉�"
@@ -45257,7 +45365,16 @@ msgid ""
 "$ git switch feature\n"
 "$ git reset --soft HEAD^ ;# go back to WIP state  <2>\n"
 "$ git reset                                       <3>\n"
-msgstr "$ git switch feature ;# 鵝졾쑉 \"feature \"�녷뵱藥δ퐳竊뚦뭉訝�\n$ work work work;# 熬ユ돀��틙\n$ git commit -a -m \"snapshot WIP\" <1\n$ git switch master\n$ fix fix fix\n$ git commit ;# �먧벡�뜻쐣�잌츩�ε퓱\n$ git switch feature\n$ git reset --soft HEAD^ ;# �욃댆 WIP �뜻�� <2>\n$ git reset <3>\n"
+msgstr ""
+"$ git switch feature ;# 鵝졾쑉 \"feature \"�녷뵱藥δ퐳竊뚦뭉訝�\n"
+"$ work work work;# 熬ユ돀��틙\n"
+"$ git commit -a -m \"snapshot WIP\" <1\n"
+"$ git switch master\n"
+"$ fix fix fix\n"
+"$ git commit ;# �먧벡�뜻쐣�잌츩�ε퓱\n"
+"$ git switch feature\n"
+"$ git reset --soft HEAD^ ;# �욃댆 WIP �뜻�� <2>\n"
+"$ git reset <3>\n"
 
 #. type: Plain text
 #: en/git-reset.txt:276
@@ -45302,7 +45419,10 @@ msgid ""
 "$ git reset -- frotz.c                      <1>\n"
 "$ git commit -m \"Commit files in index\"     <2>\n"
 "$ git add frotz.c                           <3>\n"
-msgstr "$ git reset -- frotz.c <1>.\n$ git commit -m \"弱녷뻼餓뜹춼�η뇨凉�\" <2>\n$ git add frotz.c <3>\n"
+msgstr ""
+"$ git reset -- frotz.c <1>.\n"
+"$ git commit -m \"弱녷뻼餓뜹춼�η뇨凉�\" <2>\n"
+"$ git add frotz.c <3>\n"
 
 #. type: Plain text
 #: en/git-reset.txt:298
@@ -45396,7 +45516,15 @@ msgid ""
 "$ git add ...                               <6>\n"
 "$ git diff --cached                         <7>\n"
 "$ git commit ...                            <8>\n"
-msgstr "$ git reset -N HEAD^ <1>\n$ git add -p <2>\n$ git diff --cached <3>\n$ git commit -c HEAD@{1}.                    <4>\n...                                         <5>\n$ git add ...                               <6>\n$ git diff --cached <7>\n$ git commit ...                            <8>\n"
+msgstr ""
+"$ git reset -N HEAD^ <1>\n"
+"$ git add -p <2>\n"
+"$ git diff --cached <3>\n"
+"$ git commit -c HEAD@{1}.                    <4>\n"
+"...                                         <5>\n"
+"$ git add ...                               <6>\n"
+"$ git diff --cached <7>\n"
+"$ git commit ...                            <8>\n"
 
 #. type: Plain text
 #: en/git-reset.txt:351
@@ -45481,7 +45609,14 @@ msgid ""
 "\t\t\t  --hard   D       D     D\n"
 "\t\t\t  --merge (disallowed)\n"
 "\t\t\t  --keep  (disallowed)\n"
-msgstr "藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n----------------------------------------------------\n A B C D --饔�쉪 A B D\n\t\t\t  -曆룟릦�� A D D\n\t\t\t  --簾х쉪 D D D\n\t\t\t  --�덂뭉 (訝띶뀅溫�)\n\t\t\t  --岳앮똻 (訝띶뀅溫�)\n"
+msgstr ""
+"藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n"
+"----------------------------------------------------\n"
+" A B C D --饔�쉪 A B D\n"
+"\t\t\t  -曆룟릦�� A D D\n"
+"\t\t\t  --簾х쉪 D D D\n"
+"\t\t\t  --�덂뭉 (訝띶뀅溫�)\n"
+"\t\t\t  --岳앮똻 (訝띶뀅溫�)\n"
 
 #. type: delimited block .
 #: en/git-reset.txt:416
@@ -45494,7 +45629,14 @@ msgid ""
 "\t\t\t  --hard   C       C     C\n"
 "\t\t\t  --merge (disallowed)\n"
 "\t\t\t  --keep   A       C     C\n"
-msgstr "藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n----------------------------------------------------\n A B C C --饔�쉪 A B C\n\t\t\t  -曆룟릦�� A C C\n\t\t\t  --簾ф�� C C C\n\t\t\t  --�덂뭉(訝띶뀅溫�)\n\t\t\t  --岳앮똻A C C\n"
+msgstr ""
+"藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n"
+"----------------------------------------------------\n"
+" A B C C --饔�쉪 A B C\n"
+"\t\t\t  -曆룟릦�� A C C\n"
+"\t\t\t  --簾ф�� C C C\n"
+"\t\t\t  --�덂뭉(訝띶뀅溫�)\n"
+"\t\t\t  --岳앮똻A C C\n"
 
 #. type: delimited block .
 #: en/git-reset.txt:426
@@ -45507,7 +45649,14 @@ msgid ""
 "\t\t\t  --hard   D       D     D\n"
 "\t\t\t  --merge  D       D     D\n"
 "\t\t\t  --keep  (disallowed)\n"
-msgstr "藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n----------------------------------------------------\n B B C D --饔츭 B D\n\t\t\t  -曆룟릦�� B D D\n\t\t\t  --簾х쉪 D D D\n\t\t\t  --�덂뭉 D D D\n\t\t\t  --岳앮똻(訝띶뀅溫�)\n"
+msgstr ""
+"藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n"
+"----------------------------------------------------\n"
+" B B C D --饔츭 B D\n"
+"\t\t\t  -曆룟릦�� B D D\n"
+"\t\t\t  --簾х쉪 D D D\n"
+"\t\t\t  --�덂뭉 D D D\n"
+"\t\t\t  --岳앮똻(訝띶뀅溫�)\n"
 
 #. type: delimited block .
 #: en/git-reset.txt:436
@@ -45520,7 +45669,14 @@ msgid ""
 "\t\t\t  --hard   C       C     C\n"
 "\t\t\t  --merge  C       C     C\n"
 "\t\t\t  --keep   B       C     C\n"
-msgstr "藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n----------------------------------------------------\n B B C C --饔츭 B C\n\t\t\t  -曆룟릦�� B C C\n\t\t\t  --簾ф�� C C C\n\t\t\t  --�덂뭉 C C C\n\t\t\t  --岳앮똻B C C\n"
+msgstr ""
+"藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n"
+"----------------------------------------------------\n"
+" B B C C --饔츭 B C\n"
+"\t\t\t  -曆룟릦�� B C C\n"
+"\t\t\t  --簾ф�� C C C\n"
+"\t\t\t  --�덂뭉 C C C\n"
+"\t\t\t  --岳앮똻B C C\n"
 
 #. type: delimited block .
 #: en/git-reset.txt:446
@@ -45533,7 +45689,14 @@ msgid ""
 "\t\t\t  --hard   D       D     D\n"
 "\t\t\t  --merge (disallowed)\n"
 "\t\t\t  --keep  (disallowed)\n"
-msgstr "藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n----------------------------------------------------\n B C C D --饔츭 C D\n\t\t\t  -曆룟릦�� B D D\n\t\t\t  --簾х쉪 D D D\n\t\t\t  --�덂뭉 (訝띶뀅溫�)\n\t\t\t  --岳앮똻 (訝띶뀅溫�)\n"
+msgstr ""
+"藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n"
+"----------------------------------------------------\n"
+" B C C D --饔츭 C D\n"
+"\t\t\t  -曆룟릦�� B D D\n"
+"\t\t\t  --簾х쉪 D D D\n"
+"\t\t\t  --�덂뭉 (訝띶뀅溫�)\n"
+"\t\t\t  --岳앮똻 (訝띶뀅溫�)\n"
 
 #. type: delimited block .
 #: en/git-reset.txt:456
@@ -45546,7 +45709,14 @@ msgid ""
 "\t\t\t  --hard   C       C     C\n"
 "\t\t\t  --merge  B       C     C\n"
 "\t\t\t  --keep   B       C     C\n"
-msgstr "藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n----------------------------------------------------\n B C C C --饔츭 C C\n\t\t\t  -曆룟릦�� B C C\n\t\t\t  --簾ф�� C C C\n\t\t\t  --�덂뭉 B C C\n\t\t\t  --岳앮똻B C C\n"
+msgstr ""
+"藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n"
+"----------------------------------------------------\n"
+" B C C C --饔츭 C C\n"
+"\t\t\t  -曆룟릦�� B C C\n"
+"\t\t\t  --簾ф�� C C C\n"
+"\t\t\t  --�덂뭉 B C C\n"
+"\t\t\t  --岳앮똻B C C\n"
 
 #. type: Plain text
 #: en/git-reset.txt:466
@@ -45577,7 +45747,14 @@ msgid ""
 "\t\t\t  --hard   B       B     B\n"
 "\t\t\t  --merge  B       B     B\n"
 "\t\t\t  --keep  (disallowed)\n"
-msgstr "藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n----------------------------------------------------\n X U A B --饔�펷訝띶뀅溫몌펹��\n\t\t\t  --曆룟릦�� X B B\n\t\t\t  --簾х쉪 B B B\n\t\t\t  --�덂뭉 B B B\n\t\t\t  --岳앮똻(訝띶뀅溫�)\n"
+msgstr ""
+"藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n"
+"----------------------------------------------------\n"
+" X U A B --饔�펷訝띶뀅溫몌펹��\n"
+"\t\t\t  --曆룟릦�� X B B\n"
+"\t\t\t  --簾х쉪 B B B\n"
+"\t\t\t  --�덂뭉 B B B\n"
+"\t\t\t  --岳앮똻(訝띶뀅溫�)\n"
 
 #. type: delimited block .
 #: en/git-reset.txt:497
@@ -45590,7 +45767,14 @@ msgid ""
 "\t\t\t  --hard   A       A     A\n"
 "\t\t\t  --merge  A       A     A\n"
 "\t\t\t  --keep  (disallowed)\n"
-msgstr "藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n----------------------------------------------------\n X U A A --饔�(訝띶뀅溫�)\n\t\t\t  --曆룟릦�� X A A\n\t\t\t  --簾ф�� A A A\n\t\t\t  --�덂뭉 A A A\n\t\t\t  --岳앮똻(訝띶뀅溫�)\n"
+msgstr ""
+"藥δ퐳榮℡폊 HEAD ��젃藥δ퐳榮℡폊 HEAD\n"
+"----------------------------------------------------\n"
+" X U A A --饔�(訝띶뀅溫�)\n"
+"\t\t\t  --曆룟릦�� X A A\n"
+"\t\t\t  --簾ф�� A A A\n"
+"\t\t\t  --�덂뭉 A A A\n"
+"\t\t\t  --岳앮똻(訝띶뀅溫�)\n"
 
 #. type: Plain text
 #: en/git-reset.txt:500
@@ -45617,7 +45801,10 @@ msgid ""
 "'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
 "'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
 "'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]\n"
-msgstr "'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul] ��\n'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]\n"
+msgstr ""
+"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
+"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul] ��\n"
+"'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]\n"
 
 #. type: Plain text
 #: en/git-restore.txt:20
@@ -47637,521 +47824,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, fuzzy, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr "--to-cmd=<command>"
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, fuzzy, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr "--smtp-encryption=<encryption>"
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, fuzzy, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr "--smtp-domain=<FQDN>"
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, fuzzy, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr "--smtp-pass[=<password>]"
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, fuzzy, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr "--smtp-server-port=<port>"
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, fuzzy, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr "--smtp-user=<user>"
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, fuzzy, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr "--smtp-debug=0|1"
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, fuzzy, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr "--relogin-delay=<int>"
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, fuzzy, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr "--to-cmd=<command>"
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, fuzzy, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr "--cc-cmd=<command>"
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, fuzzy, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr "--identity=<identity>"
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, fuzzy, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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 "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."
 
 #. type: Labeled list
-#: en/git-send-email.txt:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, fuzzy, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr "--suppress-cc=<category>"
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, fuzzy, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr "'sob' 弱녽겳�띶똿�х��띹죱訝�룓�곁쉪餓삡퐬雅븝펽 �ㅴ틙�ゆ닊 竊덁맏閭ㅴ슴�� \"�ゆ닊\" 竊됥��"
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, fuzzy, 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 "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."
 
 #. type: Plain text
-#: en/git-send-email.txt:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, fuzzy, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr "--confirm=<mode>"
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -48161,151 +48366,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, fuzzy, no-wrap, priority:100
 msgid "Information"
 msgstr "岳→겘"
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, fuzzy, no-wrap, priority:100
 msgid "sendmail"
 msgstr "sendmail"
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, fuzzy, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -48321,25 +48526,25 @@ msgstr ""
 "\tsmtpServerPort = 587\n"
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, fuzzy, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -48351,19 +48556,19 @@ msgstr ""
 "\t$ git send-email outgoing/*\n"
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -48771,7 +48976,9 @@ msgstr "git-shortlog - Summarize 'git log' output"
 msgid ""
 "'git shortlog' [<options>] [<revision range>] [[--] <path>...]\n"
 "git log --pretty=short | 'git shortlog' [<options>]\n"
-msgstr "'git shortlog' [<options>] [<revision range>] [[--] <path>...] ��\ngit log --pretty=short | 'git shortlog' [<options>] ��\n"
+msgstr ""
+"'git shortlog' [<options>] [<revision range>] [[--] <path>...] ��\n"
+"git log --pretty=short | 'git shortlog' [<options>] ��\n"
 
 #. type: Plain text
 #: en/git-shortlog.txt:18
@@ -50053,253 +50260,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, fuzzy, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr "pop [--index] [-q|--quiet] [<stash>]"
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, fuzzy, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr "apply [--index] [-q|--quiet] [<stash>]"
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, fuzzy, no-wrap, priority:240
 msgid "clear"
 msgstr "歷낂솮"
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, fuzzy, no-wrap, priority:240
 msgid "store"
 msgstr "�녶틭"
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, fuzzy, no-wrap, priority:240
 msgid "<stash>"
 msgstr "<stash>"
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -50308,31 +50515,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, fuzzy, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -50350,13 +50557,13 @@ msgstr ""
 "$ git stash pop\n"
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -50371,13 +50578,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -50389,19 +50596,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -50416,19 +50623,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -50437,7 +50644,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -50829,7 +51036,32 @@ msgid ""
 "?           ?    untracked\n"
 "!           !    ignored\n"
 "-------------------------------------------------\n"
-msgstr "X Y�꾢맜阿�\n-------------------------------------------------\n\t [AMD]�ゆ쎍��\nM [MD] �①뇨凉뺜릎�닸뼭\nA [MD] 曆삣뒥�곁뇨凉뺜릎\nD 餓롧뇨凉뺜릎�좈솮\nR [MD] �①뇨凉뺜릎�띷뼭�썲릫\nC [MD] �①뇨凉뺜릎熬ュ쨳��\n[MARC] 榮℡폊�뚦램鵝쒏젒�멨뙶��\n[MARC] M藥δ퐳�묋눎榮℡폊餓ζ씎�묊뵟雅녶룜��\n[MARC] D�ⓨ램鵝쒏젒訝�˙�좈솮\n[D] R�ⓨ램鵝쒏젒訝�뇥�겼뫝��\n[D] C�ⓨ램鵝쒏젒訝�˙鸚띶댍\n-------------------------------------------------\nD D�ゅ릦亮띰펽�뉐럴�좈솮\nA U �ゅ릦亮띰펽�길닊餓ф렌��\nU D �ゅ릦亮띰펽熬ヤ퍟餓у닠��\nU A �ゅ릦亮띰펽�긴퍟餓ф렌��\nD U�ゅ릦亮띰펽熬ユ닊餓у닠��\nA A�ゅ릦亮띰펽�썼˙曆삣뒥\nU U�ゅ릦亮띰펽�썼˙岳�뵻\n-------------------------------------------------\n?           �よ˙瓦썼릉��\n!           恙썹븼訝띹�\n-------------------------------------------------\n"
+msgstr ""
+"X Y�꾢맜阿�\n"
+"-------------------------------------------------\n"
+"\t [AMD]�ゆ쎍��\n"
+"M [MD] �①뇨凉뺜릎�닸뼭\n"
+"A [MD] 曆삣뒥�곁뇨凉뺜릎\n"
+"D 餓롧뇨凉뺜릎�좈솮\n"
+"R [MD] �①뇨凉뺜릎�띷뼭�썲릫\n"
+"C [MD] �①뇨凉뺜릎熬ュ쨳��\n"
+"[MARC] 榮℡폊�뚦램鵝쒏젒�멨뙶��\n"
+"[MARC] M藥δ퐳�묋눎榮℡폊餓ζ씎�묊뵟雅녶룜��\n"
+"[MARC] D�ⓨ램鵝쒏젒訝�˙�좈솮\n"
+"[D] R�ⓨ램鵝쒏젒訝�뇥�겼뫝��\n"
+"[D] C�ⓨ램鵝쒏젒訝�˙鸚띶댍\n"
+"-------------------------------------------------\n"
+"D D�ゅ릦亮띰펽�뉐럴�좈솮\n"
+"A U �ゅ릦亮띰펽�길닊餓ф렌��\n"
+"U D �ゅ릦亮띰펽熬ヤ퍟餓у닠��\n"
+"U A �ゅ릦亮띰펽�긴퍟餓ф렌��\n"
+"D U�ゅ릦亮띰펽熬ユ닊餓у닠��\n"
+"A A�ゅ릦亮띰펽�썼˙曆삣뒥\n"
+"U U�ゅ릦亮띰펽�썼˙岳�뵻\n"
+"-------------------------------------------------\n"
+"?           �よ˙瓦썼릉��\n"
+"!           恙썹븼訝띹�\n"
+"-------------------------------------------------\n"
 
 #. type: Plain text
 #: en/git-status.txt:251
@@ -50842,7 +51074,14 @@ msgid ""
 "\t\t?    the submodule has untracked files\n"
 "since modified content or untracked files in a submodule cannot be added\n"
 "via `git add` in the superproject to prepare a commit.\n"
-msgstr "耶먩Æ�쀦쐣�닷쩀�꾤듁�곻펽�뚧삸�ε몜\n\t\tM�꾢춴與▼쓼�됦�訝や툖�뚨쉪HEAD驪�\n\t\t     溫겼퐬�①뇨凉뺜릎\n\t\tm 瑥ε춴與▼쓼�됦엶�밭쉪�끻�\n\t\t瑥ε춴與▼쓼�됪쑋瓮잒릉�꾣뻼餓�\n�졽맏耶먩Æ�쀤릎�꾡엶�밧냵若방닑�よ퇎甕ょ쉪�뉏뻑訝띹꺗熬ユ렌�졾댆\n�싪퓝擁끿벨窈밭쎅訝�쉪`git add`�ε뇛鸚뉑룓雅ㅳ��\n"
+msgstr ""
+"耶먩Æ�쀦쐣�닷쩀�꾤듁�곻펽�뚧삸�ε몜\n"
+"\t\tM�꾢춴與▼쓼�됦�訝や툖�뚨쉪HEAD驪�\n"
+"\t\t     溫겼퐬�①뇨凉뺜릎\n"
+"\t\tm 瑥ε춴與▼쓼�됦엶�밭쉪�끻�\n"
+"\t\t瑥ε춴與▼쓼�됪쑋瓮잒릉�꾣뻼餓�\n"
+"�졽맏耶먩Æ�쀤릎�꾡엶�밧냵若방닑�よ퇎甕ょ쉪�뉏뻑訝띹꺗熬ユ렌�졾댆\n"
+"�싪퓝擁끿벨窈밭쎅訝�쉪`git add`�ε뇛鸚뉑룓雅ㅳ��\n"
 
 #. type: Plain text
 #: en/git-status.txt:254
@@ -50940,7 +51179,15 @@ msgid ""
 "# branch.ab +<ahead> -<behind>           If upstream is set and\n"
 "\t\t\t\t\t the commit is present.\n"
 "------------------------------------------------------------\n"
-msgstr "瀛욤러瑥닸삇\n------------------------------------------------------------\n# branch.oid <commit> | (�앭쭓) 壤볟뎺�꾣룓雅ㅳ��\n# branch.head <branch> | (detached) 壤볟뎺�녷뵱��\n# branch.upstream <upstream_branch> 倻귝옖upstream熬ヨ�營���\n# branch.ab +<ahead> -<behind> 倻귝옖訝딀만熬ヨ�營�툝\n\t\t\t\t\t �꾣룓雅ㅶ삸耶섇쑉�꾠��\n------------------------------------------------------------\n"
+msgstr ""
+"瀛욤러瑥닸삇\n"
+"------------------------------------------------------------\n"
+"# branch.oid <commit> | (�앭쭓) 壤볟뎺�꾣룓雅ㅳ��\n"
+"# branch.head <branch> | (detached) 壤볟뎺�녷뵱��\n"
+"# branch.upstream <upstream_branch> 倻귝옖upstream熬ヨ�營���\n"
+"# branch.ab +<ahead> -<behind> 倻귝옖訝딀만熬ヨ�營�툝\n"
+"\t\t\t\t\t �꾣룓雅ㅶ삸耶섇쑉�꾠��\n"
+"------------------------------------------------------------\n"
 
 #. type: Title ^
 #: en/git-status.txt:315
@@ -51011,7 +51258,36 @@ msgid ""
 "\t    This is only present in a renamed/copied entry, and\n"
 "\t    tells where the renamed/copied contents came from.\n"
 "--------------------------------------------------------\n"
-msgstr "窯녶윜�ヤ퉱\n--------------------------------------------------------\n<XY> 訝�訝�2訝ゅ춻寧�쉪耶쀦�竊뚦똿�ョ윮�쇔폀訝�룒瓦곁쉪�뜻��㎩뭽�욇샄餘득�쬧Y�쇈��\n\t    �뜻��㎩뭽�욇샄餘득�㎫쉪XY�쇈��\n\t    訝띶룜�꾤뵪\". \"烏①ㅊ竊뚩�뚥툖��뵪令뷸졏��\n\t    �뚥툖��㈉�쇈��\n<sub> 訝�訝�4訝ゅ춻寧�쉪耶쀦�竊뚧룒瓦겼춴與▼쓼�꾤듁�곥��\n\t    \"N... \"壤볠씉��툖���訝ゅ춴與▼쓼�뜰��\n\t    \"S<c><m><u>\" 壤볠씉��삸訝�訝ゅ춴與▼쓼��\n\t    <c>�� \"C\"竊뚦쫩�쒏룓雅ㅶ뵻�섆틙竊쎾맔�숁삸\".\"��\n\t    <m> 倻귝옖若껅쐣瓮잒릉�꾢룜�뽳펽�쇾맏 \"M\"竊쎾맔�쇾맏\".\"��\n\t    <u> 倻귝옖�됪쑋瓦썼릉�꾡엶�뱄펽�쇾맏 \"U\"竊쎾맔�쇾맏\".\"��\n<mH> HEAD訝�쉪�ヨ퓵�뜻뻼餓뜻Æ凉뤵��\n<mI> 榮℡폊訝�쉪�ヨ퓵�뜻뻼餓뜻Æ凉뤵��\n<mW> 藥δ퐳�묇릎�꾢뀵瓦쎾댍�뉏뻑與▼폀��\n<hH> HEAD訝�쉪野배괌�띸㎞��\n<hI> 榮℡폊訝�쉪野배괌�띸㎞��\n<X><score> �띶뫝�띷닑鸚띶댍�녷빊竊덅〃鹽뷸틦�뉏뻑�뚨쎅�뉑뻼餓뜸퉳�당쉪�멧세�얍늽驪뷂펹��\n\t    繹먨뭽��젃阿뗩뿴�꾤쎑鴉쇔벧竊됥��\n\t    燁삣뒯�뽩쨳�띄쉪��젃阿뗩뿴�꾤쎑鴉쇔벧竊됥��)堊뗥쫩竊�\"R100 \"�� \"C75\"��\n<path> 瓮�푶�띲��  �ⓧ�訝ら뇥�썲릫/鸚띶댍�꾣씉��릎竊뚩퓳\n\t    ��쎅�뉓러孃꾠��\n<sep> 壤볞슴��`-z`�됮」�띰펽訝ㅴ릉瓮�푶�띸뵪NUL(ASCII 0x00)�녽슂��\n\t    �ⓧ�訝찺UL(ASCII 0x00)耶쀨뒄�녶�竊쎾맔�숋펽�ⓧ�訝챆AB(ASCII 0x09)\n\t    耶쀨뒄�ε늽�붷츆餓с��\n<origPath> �쭴EAD�뽫뇨凉뺜릎�먧벡�꾥러孃꾢릫��\n\t    瓦쇿룵耶섇쑉雅롩뇥�썲릫/鸚띶댍�꾣씉��릎竊뚦뭉訝�\n\t    �딂칹鵝좈뇥�썲릫/鸚띶댍�꾢냵若방씎�ゅ벆�뚣��\n--------------------------------------------------------\n"
+msgstr ""
+"窯녶윜�ヤ퉱\n"
+"--------------------------------------------------------\n"
+"<XY> 訝�訝�2訝ゅ춻寧�쉪耶쀦�竊뚦똿�ョ윮�쇔폀訝�룒瓦곁쉪�뜻��㎩뭽�욇샄餘득�쬧Y�쇈��\n"
+"\t    �뜻��㎩뭽�욇샄餘득�㎫쉪XY�쇈��\n"
+"\t    訝띶룜�꾤뵪\". \"烏①ㅊ竊뚩�뚥툖��뵪令뷸졏��\n"
+"\t    �뚥툖��㈉�쇈��\n"
+"<sub> 訝�訝�4訝ゅ춻寧�쉪耶쀦�竊뚧룒瓦겼춴與▼쓼�꾤듁�곥��\n"
+"\t    \"N... \"壤볠씉��툖���訝ゅ춴與▼쓼�뜰��\n"
+"\t    \"S<c><m><u>\" 壤볠씉��삸訝�訝ゅ춴與▼쓼��\n"
+"\t    <c>�� \"C\"竊뚦쫩�쒏룓雅ㅶ뵻�섆틙竊쎾맔�숁삸\".\"��\n"
+"\t    <m> 倻귝옖若껅쐣瓮잒릉�꾢룜�뽳펽�쇾맏 \"M\"竊쎾맔�쇾맏\".\"��\n"
+"\t    <u> 倻귝옖�됪쑋瓦썼릉�꾡엶�뱄펽�쇾맏 \"U\"竊쎾맔�쇾맏\".\"��\n"
+"<mH> HEAD訝�쉪�ヨ퓵�뜻뻼餓뜻Æ凉뤵��\n"
+"<mI> 榮℡폊訝�쉪�ヨ퓵�뜻뻼餓뜻Æ凉뤵��\n"
+"<mW> 藥δ퐳�묇릎�꾢뀵瓦쎾댍�뉏뻑與▼폀��\n"
+"<hH> HEAD訝�쉪野배괌�띸㎞��\n"
+"<hI> 榮℡폊訝�쉪野배괌�띸㎞��\n"
+"<X><score> �띶뫝�띷닑鸚띶댍�녷빊竊덅〃鹽뷸틦�뉏뻑�뚨쎅�뉑뻼餓뜸퉳�당쉪�멧세�얍늽驪뷂펹��\n"
+"\t    繹먨뭽��젃阿뗩뿴�꾤쎑鴉쇔벧竊됥��\n"
+"\t    燁삣뒯�뽩쨳�띄쉪��젃阿뗩뿴�꾤쎑鴉쇔벧竊됥��)堊뗥쫩竊�\"R100 \"�� \"C75\"��\n"
+"<path> 瓮�푶�띲��  �ⓧ�訝ら뇥�썲릫/鸚띶댍�꾣씉��릎竊뚩퓳\n"
+"\t    ��쎅�뉓러孃꾠��\n"
+"<sep> 壤볞슴��`-z`�됮」�띰펽訝ㅴ릉瓮�푶�띸뵪NUL(ASCII 0x00)�녽슂��\n"
+"\t    �ⓧ�訝찺UL(ASCII 0x00)耶쀨뒄�녶�竊쎾맔�숋펽�ⓧ�訝챆AB(ASCII 0x09)\n"
+"\t    耶쀨뒄�ε늽�붷츆餓с��\n"
+"<origPath> �쭴EAD�뽫뇨凉뺜릎�먧벡�꾥러孃꾢릫��\n"
+"\t    瓦쇿룵耶섇쑉雅롩뇥�썲릫/鸚띶댍�꾣씉��릎竊뚦뭉訝�\n"
+"\t    �딂칹鵝좈뇥�썲릫/鸚띶댍�꾢냵若방씎�ゅ벆�뚣��\n"
+"--------------------------------------------------------\n"
 
 #. type: Plain text
 #: en/git-status.txt:365
@@ -51044,7 +51320,22 @@ msgid ""
 "<h3>        The object name in stage 3.\n"
 "<path>      The pathname.\n"
 "--------------------------------------------------------\n"
-msgstr "窯녶윜�ヤ퉱\n--------------------------------------------------------\n<XY> 訝�訝�2訝ゅ춻寧�쉪耶쀦�竊뚧룒瓦겼넳囹곭굳��\n\t    �뤺염�꿰챳映삣엹��\n<sub> 訝�訝�4訝ゅ춻寧�쉪耶쀦�竊뚧룒瓦겼춴與▼쓼�꾤듁��\n\t    倻귚툓��瓦겹��\n<m1> �뜻�1訝�쉪�ヨ퓵�뜻뻼餓뜻Æ凉뤵��\n<m2> �뜻�2訝�쉪�ヨ퓵�뜻뻼餓뜻Æ凉뤵��\n<m3> �뜻�3訝�쉪�ヨ퓵�뜻뻼餓뜻Æ凉뤵��\n<mW> 藥δ퐳�묇릎�꾢뀵瓦쎾댍�뉏뻑與▼폀��\n<h1> �뜻�1訝�쉪野배괌�띸㎞��\n<h2> 寧т틠�뜻��꾢�穩▼릫燁겹��\n<h3> 寧т툒�뜻��꾢�穩▼릫燁겹��\n<path> 瓮�푶�띲��\n--------------------------------------------------------\n"
+msgstr ""
+"窯녶윜�ヤ퉱\n"
+"--------------------------------------------------------\n"
+"<XY> 訝�訝�2訝ゅ춻寧�쉪耶쀦�竊뚧룒瓦겼넳囹곭굳��\n"
+"\t    �뤺염�꿰챳映삣엹��\n"
+"<sub> 訝�訝�4訝ゅ춻寧�쉪耶쀦�竊뚧룒瓦겼춴與▼쓼�꾤듁��\n"
+"\t    倻귚툓��瓦겹��\n"
+"<m1> �뜻�1訝�쉪�ヨ퓵�뜻뻼餓뜻Æ凉뤵��\n"
+"<m2> �뜻�2訝�쉪�ヨ퓵�뜻뻼餓뜻Æ凉뤵��\n"
+"<m3> �뜻�3訝�쉪�ヨ퓵�뜻뻼餓뜻Æ凉뤵��\n"
+"<mW> 藥δ퐳�묇릎�꾢뀵瓦쎾댍�뉏뻑與▼폀��\n"
+"<h1> �뜻�1訝�쉪野배괌�띸㎞��\n"
+"<h2> 寧т틠�뜻��꾢�穩▼릫燁겹��\n"
+"<h3> 寧т툒�뜻��꾢�穩▼릫燁겹��\n"
+"<path> 瓮�푶�띲��\n"
+"--------------------------------------------------------\n"
 
 #. type: Title ^
 #: en/git-status.txt:387
@@ -52567,7 +52858,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:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -58743,7 +59034,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -59050,7 +59341,7 @@ msgstr "--reason <string>"
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -59247,7 +59538,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 "$ git worktree list\n"
@@ -59735,7 +60026,7 @@ msgstr "[[def_fast_forward]]fast-forward"
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -60772,7 +61063,9 @@ msgstr "'git log', 'git show', 'git blame' and friends look at the `encoding` he
 msgid ""
 "[i18n]\n"
 "\tlogOutputEncoding = ISO-8859-1\n"
-msgstr "[i18n]\n\tlogOutputEncoding = ISO-8859-1\n"
+msgstr ""
+"[i18n]\n"
+"\tlogOutputEncoding = ISO-8859-1\n"
 
 #. type: Plain text
 #: en/i18n.txt:66
@@ -61555,7 +61848,9 @@ msgstr "'short'"
 msgid ""
 "commit <hash>\n"
 "Author: <author>\n"
-msgstr "�욤�<hash>\n鵝쒑�끹��<鵝쒑��>�꾣깄��\n"
+msgstr ""
+"�욤�<hash>\n"
+"鵝쒑�끹��<鵝쒑��>�꾣깄��\n"
 
 #. type: Plain text
 #: en/pretty-formats.txt:33 en/pretty-formats.txt:41 en/pretty-formats.txt:51 en/pretty-formats.txt:63
@@ -61576,7 +61871,10 @@ msgid ""
 "commit <hash>\n"
 "Author: <author>\n"
 "Date:   <author date>\n"
-msgstr "�욤�<hash>\n鵝쒑�끹��<鵝쒑��>�꾣깄��\n�ζ쐿��   <鵝쒑��>�ζ쐿\n"
+msgstr ""
+"�욤�<hash>\n"
+"鵝쒑�끹��<鵝쒑��>�꾣깄��\n"
+"�ζ쐿��   <鵝쒑��>�ζ쐿\n"
 
 #. type: Plain text
 #: en/pretty-formats.txt:43 en/pretty-formats.txt:53 en/pretty-formats.txt:65 en/pretty-formats.txt:85
@@ -61597,7 +61895,10 @@ msgid ""
 "commit <hash>\n"
 "Author: <author>\n"
 "Commit: <committer>\n"
-msgstr "�욤�<hash>\n鵝쒑�끹��< Author>\n�욤���<committer>竊덃룓雅ㅸ�낉펹��\n"
+msgstr ""
+"�욤�<hash>\n"
+"鵝쒑�끹��< Author>\n"
+"�욤���<committer>竊덃룓雅ㅸ�낉펹��\n"
 
 #. type: Plain text
 #: en/pretty-formats.txt:55
@@ -61614,7 +61915,12 @@ msgid ""
 "AuthorDate: <author date>\n"
 "Commit:     <committer>\n"
 "CommitDate: <committer date>\n"
-msgstr "�욤�<hash>\n鵝쒑�끹��     <鵝쒑��>�꾣깄��\n鵝쒑�끾뿥�잆��<鵝쒑�끾뿥��>��\n�욤���     <�욤���>\n�먧벡�ζ쐿��<�먧벡�끾뿥��>\n"
+msgstr ""
+"�욤�<hash>\n"
+"鵝쒑�끹��     <鵝쒑��>�꾣깄��\n"
+"鵝쒑�끾뿥�잆��<鵝쒑�끾뿥��>��\n"
+"�욤���     <�욤���>\n"
+"�먧벡�ζ쐿��<�먧벡�끾뿥��>\n"
 
 #. type: Plain text
 #: en/pretty-formats.txt:67
@@ -61649,7 +61955,11 @@ msgid ""
 "From: <author>\n"
 "Date: <author date>\n"
 "Subject: [PATCH] <title line>\n"
-msgstr "�θ눎<hash><date>�꾡에��\n�θ눎��<鵝쒑��\n�ζ쐿��<鵝쒑��>�ζ쐿\n訝삯쥦��[PATCH] <�뉔쥦烏�\n"
+msgstr ""
+"�θ눎<hash><date>�꾡에��\n"
+"�θ눎��<鵝쒑��\n"
+"�ζ쐿��<鵝쒑��>�ζ쐿\n"
+"訝삯쥦��[PATCH] <�뉔쥦烏�\n"
 
 #. type: Plain text
 #: en/pretty-formats.txt:87
@@ -61700,7 +62010,9 @@ msgstr "堊뗥쫩竊�'format: \"The author of %h was %an, %ar%nThe title was >>%s<<%
 msgid ""
 "The author of fe6e0ee was Junio C Hamano, 23 hours ago\n"
 "The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<\n"
-msgstr "fe6e0ee�꾡퐳�끾삸Junio C Hamano, 23弱뤸뿶��\n�뉔쥦�� >>t4119: 役뗨캊鴉좂퍨diff渦볟뀯�꾥눎�②�嶸�-p<n>��\n"
+msgstr ""
+"fe6e0ee�꾡퐳�끾삸Junio C Hamano, 23弱뤸뿶��\n"
+"�뉔쥦�� >>t4119: 役뗨캊鴉좂퍨diff渦볟뀯�꾥눎�②�嶸�-p<n>��\n"
 
 #. type: Plain text
 #: en/pretty-formats.txt:121
@@ -63435,194 +63747,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, fuzzy, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr "1 --- 2 --- 3 --- 4 --- 5\n"
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, fuzzy, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr "'<rev>'"
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, fuzzy, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr "'<rev1>..<rev2>'"
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, fuzzy, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -63723,7 +64071,9 @@ msgstr "�╊�訝ょ돶餘딁쉪寧�뤇��\"'<commit1>'...'<commit2>'\"竊뚦��덂뭉孃�
 msgid ""
 "$ git rev-list A B --not $(git merge-base --all A B)\n"
 "$ git rev-list A...B\n"
-msgstr "$ git rev-list A B --not $(git merge-base --all A B)\n$ git rev-list A...B\n"
+msgstr ""
+"$ git rev-list A B --not $(git merge-base --all A B)\n"
+"$ git rev-list A...B\n"
 
 #. type: delimited block -
 #: en/rev-list-description.txt:60
@@ -63731,7 +64081,9 @@ msgstr "$ git rev-list A B --not $(git merge-base --all A B)\n$ git rev-list A..
 msgid ""
 "$ git log A B --not $(git merge-base --all A B)\n"
 "$ git log A...B\n"
-msgstr "$ git log A B --not $(git merge-base --all A B)\n$ git log A...B\n"
+msgstr ""
+"$ git log A B --not $(git merge-base --all A B)\n"
+"$ git log A...B\n"
 
 #. type: Title ~
 #: en/rev-list-options.txt:2
@@ -64768,7 +65120,12 @@ msgid ""
 "\t  B---C---G---H---I---J\n"
 "\t /                     \\\n"
 "\tA-------K---------------L--M\n"
-msgstr "\t    D--E-------F\n\t   / \\ \\\n\t  B---C---G---H---I---J\n\t / \\\n\tA-------K---------------L--M\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/rev-list-options.txt:580
@@ -64791,7 +65148,12 @@ msgid ""
 "\t\t  G---H---I---J\n"
 "\t\t\t       \\\n"
 "\t\t\t\tL--M\n"
-msgstr "\t\tE-------F\n\t\t \\ \\\n\t\t  G--H--I--J\n\t\t\t       \\\n\t\t\t\tL--M\n"
+msgstr ""
+"\t\tE-------F\n"
+"\t\t \\ \\\n"
+"\t\t  G--H--I--J\n"
+"\t\t\t       \\\n"
+"\t\t\t\tL--M\n"
 
 #. type: Plain text
 #: en/rev-list-options.txt:597
@@ -65249,8 +65611,9 @@ msgstr "'--filter=object:type=(tag|commit|tree|blob)'�꾢숱凉뤶폏�곭븼���됦툖
 
 #. type: Plain text
 #: en/rev-list-options.txt:902
-#, 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."
+#, fuzzy, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr "壤℡폀'--filter=sparse:oid=<blob-ish>'鵝욜뵪�끻맜�쮊lob竊덃닑blob烏②씨凉륅펹'<blob-ish>'訝�쉪葉��뤸��븃쭊�껅씎�곭븼�ｄ틳野배�黎귞쉪 refs 瓦쏂죱葉��뤸��뷸뿶訝띺�誤곭쉪 blobs��"
 
 #. type: Plain text
@@ -65511,56 +65874,81 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr "餓ε렅冶뗦졏凉뤸돀�경룓雅ㅷ쉪�끻�竊쎿캀�↑�壤뺟뵪NUL耶쀧Е�녽슂��"
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, fuzzy, priority:260
+#| msgid "Overrides a previous `--no-walk`."
+msgid "Overrides a previous `--no-commit-header`."
+msgstr "誤녺썣阿뗥뎺��`--訝띹뎔'��"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr "�볟뜲�잌쭓�먧벡�띌뿴�녈��"
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr "堊뗥쫩竊뚦쫩�쒍퐷�됭퓳�루쉪�볠뎾瀯볠엫��"
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, fuzzy, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -65576,19 +65964,19 @@ msgstr ""
 "\t o---x---a---a  branch A\n"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr "鵝졽폏孃쀥댆瓦숁졆�꾥풏�뷩��"
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, fuzzy, ignore-ellipsis, no-wrap, priority:260
 msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
 msgstr "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1109
+#: en/rev-list-options.txt:1117
 #, fuzzy, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -65606,43 +65994,43 @@ msgstr ""
 "\t-xxxxxxx... 1st on a\n"
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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 "�②풏�븀쉪藥�뎸渦밭퍡�뜹읃雅롦뻼�х쉪�먧벡�녶뤁�얕〃��  瓦쇿룾�썰폏野쇠눜�ⓩ룓雅ㅴ퉳�닸돀�겼눣窯앭쨼�꾥죱竊뚥빳堊욘�簾�쑑瀯섇댍�얍숱�녶뤁��  訝띹꺗訝�`--no-walk`瀯볟릦鵝욜뵪��"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr "瓦쇿룾餓δ슴�뜸빰�밧넍竊뚩쭅訝딃씊��'�녶뤁嶸���'��"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, priority:260
 msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
 msgstr "瓦숁꼷�녕�容섋��끻넻訝뗦삸`--topo-order`�됮」竊뚥퐜阿잌룾餓ζ뙁若�`--date-order`�됮」��"
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1123
+#: en/rev-list-options.txt:1131
 #, fuzzy, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr "--show-linear-break[=<barrier>]"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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 "倻귝옖訝띴슴�� --graph竊뚧��됬쉪�녶뤁�녷뵱�썰폏熬ュ럨�곻펽瓦쇿갚孃덆슻�뗥눣訝ㅴ릉瓦욅뺌�꾣룓雅ㅵ뭉訝띶콪雅롣�訝ょ봇�㎩늽���귛쑉瓦숂쭕�끻넻訝뗰펽瑥ι�됮」鴉싧쑉若껂뺄阿뗩뿴溫양쉰訝�訝ら슌閻띲�귛쫩�쒏뙁若싦틙\"<barrier>\"竊뚦갚鴉싨샑鹽븃퓳訝ゅ춻寧╊림竊뚩�뚥툖��퍡溫ㅷ쉪��"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1147
 #, 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 "�볟뜲訝�訝ゆ빊耶쀯펽瑥닸삇�됧쩀弱묉룓雅ㅴ폏熬ュ닓�븝펽亮뜻뒔�뜻��됧끀餓뽬풏�뷩��  壤볞툗`--藥�--��'訝�壅룝슴�ⓩ뿶竊뚥폏�볟뜲藥�뭽�녕쉪�먧벡溫→빊竊뚨뵪�띈〃寧�늽凉��귛퐪訝�`--cherry-mark`訝�壅룝슴�ⓩ뿶竊뚥퍗瓦쇾틳溫→빊訝�쐛�θ‥訝곭춬餓룡룓雅ㅿ펽�뚧돀�곁춬餓룡룓雅ㅷ쉪溫→빊竊뚨뵪tab�녽슂��"
@@ -68188,6 +68576,13 @@ msgstr "[[[8]]] https://www.kernel.org/pub/software/scm/git/docs/git-bisect.html
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 
+#~ 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 "`-M` �� `-C` �됮」��誤� O(n^2) �꾢쨪�녷뿶�댐펽�뜸릎 n ��퐳�①쉪�띶뫝��/鸚띶댍��젃�곈뇧�귛쫩�쒒뇥�썲릫/鸚띶댍��젃�꾣빊�뤺텈瓦뉏틙�뉐츣�꾣빊�륅펽瑥ι�됮」��삻閭�뇥�썲릫/鸚띶댍汝�役뗨퓧烏뚣��"
+
+#, ignore-ellipsis, no-wrap
+#~ msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+#~ msgstr "'git diff' [<options>] <commit> [--] [<path>...] ��"
+
 #, fuzzy, no-wrap
 #~ msgid "--no-diff-merges:"
 #~ msgstr "--no-diff-merges"
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index e9e18748eaa8066a93435e4eb6dae72923b6ff0c..ee736c3d79af120f6a8d5b06ab01fc115fae911a 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: 2021-05-17 17:03+0200\n"
+"POT-Creation-Date: 2021-08-03 23:17+0200\n"
 "PO-Revision-Date: 2021-01-19 16:32+0000\n"
 "Last-Translator: Lilian Wang <li330wang@gmail.com>\n"
 "Language-Team: French\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Weblate 4.5-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -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:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:155 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
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:174 en/git-grep.txt:155 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:26 en/diff-options.txt:135 en/fetch-options.txt:167 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:26 en/diff-options.txt:135 en/fetch-options.txt:176 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:120 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
 #, ignore-same, no-wrap, priority:280
 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:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:122 en/rev-list-options.txt:124
 #, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
 msgstr "--first-parent"
@@ -137,7 +137,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:118 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:191 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:127 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:208 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:538 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:193 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:123
 #, ignore-same, no-wrap, priority:300
 msgid "-p"
 msgstr "-p"
@@ -2821,7 +2821,7 @@ 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."
+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. Defaults to true."
 msgstr ""
 
 #. type: Labeled list
@@ -2855,139 +2855,139 @@ msgid "merge.renameLimit"
 msgstr "merge.renameLimit"
 
 #. type: Plain text
-#: en/config/merge.txt:40
+#: en/config/merge.txt:42
 #, 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."
+msgid "The number of files to consider in the exhaustive portion of rename detection during a merge.  If not specified, defaults to the value of diff.renameLimit.  If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000.  This setting has no effect if rename detection is turned off."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:41
+#: en/config/merge.txt:43
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
 msgstr "merge.renames"
 
 #. type: Plain text
-#: en/config/merge.txt:45
+#: en/config/merge.txt:47
 #, 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
+#: en/config/merge.txt:48
 #, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
 msgstr "merge.directoryRenames"
 
 #. type: Plain text
-#: en/config/merge.txt:58
+#: en/config/merge.txt:60
 #, 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
+#: en/config/merge.txt:61
 #, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
 msgstr "merge.renormalize"
 
 #. type: Plain text
-#: en/config/merge.txt:68
+#: en/config/merge.txt:70
 #, 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
+#: en/config/merge.txt:71
 #, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
 msgstr "merge.stat"
 
 #. type: Plain text
-#: en/config/merge.txt:72
+#: en/config/merge.txt:74
 #, 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
+#: en/config/merge.txt:75
 #, ignore-same, no-wrap, priority:240
 msgid "merge.autoStash"
 msgstr "merge.autoStash"
 
 #. type: Plain text
-#: en/config/merge.txt:82
+#: en/config/merge.txt:84
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
 msgstr ""
 
 #. type: Labeled list
-#: en/config/merge.txt:83
+#: en/config/merge.txt:85
 #, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
 msgstr "merge.tool"
 
 #. type: Plain text
-#: en/config/merge.txt:88
+#: en/config/merge.txt:90
 #, 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:89
+#: en/config/merge.txt:91
 #, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
 msgstr "merge.guitool"
 
 #. type: Plain text
-#: en/config/merge.txt:94
+#: en/config/merge.txt:96
 #, 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:97
+#: en/config/merge.txt:99
 #, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
 msgstr "merge.verbosity"
 
 #. type: Plain text
-#: en/config/merge.txt:104
+#: en/config/merge.txt:106
 #, 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:105
+#: en/config/merge.txt:107
 #, no-wrap, priority:240
 msgid "merge.<driver>.name"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:108
+#: en/config/merge.txt:110
 #, 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:109
+#: en/config/merge.txt:111
 #, no-wrap, priority:240
 msgid "merge.<driver>.driver"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:112
+#: en/config/merge.txt:114
 #, 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:113
+#: en/config/merge.txt:115
 #, no-wrap, priority:240
 msgid "merge.<driver>.recursive"
 msgstr ""
 
 #. type: Plain text
-#: en/config/merge.txt:116
+#: en/config/merge.txt:118
 #, 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 ""
@@ -3871,13 +3871,13 @@ msgid "Generate plain patches without any diffstats."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:229 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:238 en/git-add.txt:112 en/git-am.txt:81 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:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:163
 #, ignore-same, no-wrap, priority:300
 msgid "-u"
 msgstr "-u"
 
 #. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:192
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:194
 #, ignore-same, no-wrap, priority:300
 msgid "--patch"
 msgstr "--patch"
@@ -3964,33 +3964,33 @@ msgid "-m"
 msgstr "-m"
 
 #. type: Plain text
-#: en/diff-options.txt:56
+#: en/diff-options.txt:55
 #, priority:280
-msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+msgid "This option makes diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. `-m` implies `-p`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:57
+#: en/diff-options.txt:56
 #, fuzzy, no-wrap, priority:280
 #| msgid "--first-parent"
 msgid "--diff-merges=first-parent"
 msgstr "--first-parent"
 
 #. type: Labeled list
-#: en/diff-options.txt:58
+#: en/diff-options.txt:57
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=1"
 msgstr "diffmerge"
 
 #. type: Plain text
-#: en/diff-options.txt:61
+#: en/diff-options.txt:60
 #, priority:280
 msgid "This option makes merge commits show the full diff with respect to the first parent only."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:62
+#: en/diff-options.txt:61
 #, fuzzy, no-wrap, priority:280
 #| msgid "diffmerge"
 msgid "--diff-merges=separate"
@@ -3999,7 +3999,7 @@ msgstr "diffmerge"
 #. type: Plain text
 #: en/diff-options.txt:66
 #, priority:280
-msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. This is the format that `-m` produced historically."
 msgstr ""
 
 #. type: Labeled list
@@ -4498,7 +4498,7 @@ msgid "Synonym for `-p --stat`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:215 en/git-grep.txt:175 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:173
+#: en/diff-options.txt:286 en/git-apply.txt:116 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:158 en/git-config.txt:222 en/git-grep.txt:175 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:173
 #, ignore-same, no-wrap, priority:280
 msgid "-z"
 msgstr "-z"
@@ -4530,7 +4530,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:302 en/git-config.txt:224 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:302 en/git-config.txt:231 en/git-grep.txt:157 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
 #, ignore-same, no-wrap, priority:280
 msgid "--name-only"
 msgstr "--name-only"
@@ -4757,7 +4757,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:396 en/diff-options.txt:747
+#: en/diff-options.txt:396 en/diff-options.txt:753
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4769,7 +4769,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:400 en/diff-options.txt:753
+#: en/diff-options.txt:400 en/diff-options.txt:759
 #, 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 ""
@@ -5123,79 +5123,79 @@ msgid "-l<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:602
 #, 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."
+msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources.  (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.)  For N sources and destinations, this exhaustive check is O(N^2).  This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number.  Defaults to diff.renameLimit.  Note that a value of 0 is treated as unlimited."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
 #, 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:609
+#: en/diff-options.txt:615
 #, 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:612
+#: en/diff-options.txt:618
 #, 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:618
+#: en/diff-options.txt:624
 #, 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:619
+#: en/diff-options.txt:625
 #, no-wrap, priority:280
 msgid "-S<string>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:623
+#: en/diff-options.txt:629
 #, 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:629
+#: en/diff-options.txt:635
 #, 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:631
+#: en/diff-options.txt:637
 #, priority:280
 msgid "Binary files are searched as well."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
 #, no-wrap, priority:280
 msgid "-G<regex>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:635
+#: en/diff-options.txt:641
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:645
 #, 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:644
+#: en/diff-options.txt:650
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "+    return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5204,430 +5204,430 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
 #, priority:280
 msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:658
 #, 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:655
+#: en/diff-options.txt:661
 #, priority:280
 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656
+#: en/diff-options.txt:662
 #, no-wrap, priority:280
 msgid "--find-object=<object-id>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:661
+#: en/diff-options.txt:667
 #, 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:664
+#: en/diff-options.txt:670
 #, 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:665
+#: en/diff-options.txt:671
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
 msgstr "--pickaxe-all"
 
 #. type: Plain text
-#: en/diff-options.txt:669
+#: en/diff-options.txt:675
 #, 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:670
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
 msgstr "--pickaxe-regex"
 
 #. type: Plain text
-#: en/diff-options.txt:673
+#: en/diff-options.txt:679
 #, 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:676 en/git-mergetool.txt:95
+#: en/diff-options.txt:682 en/git-mergetool.txt:95
 #, no-wrap, priority:280
 msgid "-O<orderfile>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:681
+#: en/diff-options.txt:687
 #, 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:693
+#: en/diff-options.txt:699
 #, 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:695
+#: en/diff-options.txt:701
 #, priority:280
 msgid "<orderfile> is parsed as follows:"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:699
+#: en/diff-options.txt:705
 #, priority:280
 msgid "Blank lines are ignored, so they can be used as separators for readability."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
 #, 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:705
+#: en/diff-options.txt:711
 #, priority:280
 msgid "Each other line contains a single pattern."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:712
+#: en/diff-options.txt:718
 #, 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:713 en/git-difftool.txt:41
+#: en/diff-options.txt:719 en/git-difftool.txt:41
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-removal"
 msgid "--skip-to=<file>"
 msgstr "--ignore-removal"
 
 #. type: Labeled list
-#: en/diff-options.txt:714 en/git-difftool.txt:37
+#: en/diff-options.txt:720 en/git-difftool.txt:37
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-removal"
 msgid "--rotate-to=<file>"
 msgstr "--ignore-removal"
 
 #. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:726
 #, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-apply.txt:105 en/git-cvsimport.txt:168
+#: en/diff-options.txt:728 en/git-apply.txt:105 en/git-cvsimport.txt:168
 #, no-wrap, priority:280
 msgid "-R"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:725
+#: en/diff-options.txt:731
 #, 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:727
+#: en/diff-options.txt:733
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:728
+#: en/diff-options.txt:734
 #, ignore-same, no-wrap, priority:280
 msgid "--no-relative"
 msgstr "--no-relative"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
 #, 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.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:744 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:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:70 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-stash.txt:156 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:739 en/git-grep.txt:71
+#: en/diff-options.txt:745 en/git-grep.txt:71
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:742
+#: en/diff-options.txt:748
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:745
+#: en/diff-options.txt:751
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:749 en/git-am.txt:111 en/git-apply.txt:183
+#: en/diff-options.txt:755 en/git-am.txt:111 en/git-apply.txt:183
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:754 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:760 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:103 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:755
+#: en/diff-options.txt:761
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:759
+#: en/diff-options.txt:765
 #, 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:760
+#: en/diff-options.txt:766
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:762
+#: en/diff-options.txt:768
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:763
+#: en/diff-options.txt:769
 #, no-wrap, priority:280
 msgid "-I<regex>"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:764
+#: en/diff-options.txt:770
 #, fuzzy, no-wrap, priority:280
 #| msgid "--ignore-blank-lines"
 msgid "--ignore-matching-lines=<regex>"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:773
 #, priority:280
 msgid "Ignore changes whose all lines match <regex>.  This option may be specified more than once."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:774
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:773
+#: en/diff-options.txt:779
 #, 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:774 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
+#: en/diff-options.txt:780 en/git-cvsexportcommit.txt:77 en/git-grep.txt:232 en/git-restore.txt:58
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:775 en/git-grep.txt:233
+#: en/diff-options.txt:781 en/git-grep.txt:233
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:780
+#: en/diff-options.txt:786
 #, priority:280
 msgid "Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:783 en/git-ls-remote.txt:48
+#: en/diff-options.txt:789 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:787
+#: en/diff-options.txt:793
 #, 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:788 en/fetch-options.txt:247 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:224 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
+#: en/diff-options.txt:794 en/fetch-options.txt:256 en/git-am.txt:78 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:125 en/git-commit.txt:369 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:361 en/git-gc.txt:68 en/git-grep.txt:286 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:392 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:76 en/git-send-email.txt:420 en/git-show-ref.txt:71 en/git-stash.txt:226 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:229 en/merge-options.txt:138 en/rev-list-options.txt:224
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:790
+#: en/diff-options.txt:796
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:793
+#: en/diff-options.txt:799
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:797
+#: en/diff-options.txt:803
 #, 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:798
+#: en/diff-options.txt:804
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:800
+#: en/diff-options.txt:806
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:801 en/git-cat-file.txt:60 en/git-grep.txt:74
+#: en/diff-options.txt:807 en/git-cat-file.txt:60 en/git-grep.txt:74
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:802 en/git-grep.txt:77
+#: en/diff-options.txt:808 en/git-grep.txt:77
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:811
+#: en/diff-options.txt:817
 #, 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:812 en/git-status.txt:87
+#: en/diff-options.txt:818 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:824
+#: en/diff-options.txt:830
 #, 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:825
+#: en/diff-options.txt:831
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:827
+#: en/diff-options.txt:833
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:828
+#: en/diff-options.txt:834
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:830
+#: en/diff-options.txt:836
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:831
+#: en/diff-options.txt:837
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:833
+#: en/diff-options.txt:839
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:834
+#: en/diff-options.txt:840
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:836
+#: en/diff-options.txt:842
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:837
+#: en/diff-options.txt:843
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:844
+#: en/diff-options.txt:850
 #, 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:846
+#: en/diff-options.txt:852
 #, 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:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:142
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:68 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:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:157 en/git-submodule.txt:276 en/rev-list-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--all"
 msgstr "--all"
@@ -5765,55 +5765,73 @@ msgid "The argument to this option may be a glob on ref names, a ref, or the (po
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:67
+#: en/fetch-options.txt:68
 #, priority:220
-msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
+msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:68 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
+#: en/fetch-options.txt:69
+#, ignore-same, no-wrap, priority:220
+msgid "--negotiate-only"
+msgstr "--negotiate-only"
+
+#. type: Plain text
+#: en/fetch-options.txt:73
+#, priority:220
+msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:76
+#, priority:220
+msgid "Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:77 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:372 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:53 en/git-send-email.txt:411 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:219
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: Plain text
-#: en/fetch-options.txt:70
+#: en/fetch-options.txt:79
 #, priority:220
 msgid "Show what would be done, without making any changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:72
+#: en/fetch-options.txt:81
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-fetch-head"
 msgstr "--[no-]write-fetch-head"
 
 #. type: Plain text
-#: en/fetch-options.txt:78
+#: en/fetch-options.txt:87
 #, priority:220
 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`.  This is the default.  Passing `--no-write-fetch-head` from the command line tells Git not to write the file.  Under `--dry-run` option, the file is never written."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:80 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
+#: en/fetch-options.txt:89 en/git-add.txt:78 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:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:146 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:424 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:160
 #, ignore-same, no-wrap, priority:300
 msgid "-f"
 msgstr "-f"
 
 #. type: Labeled list
-#: en/fetch-options.txt:81 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
+#: en/fetch-options.txt:90 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 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:333 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:440 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:161
 #, ignore-same, no-wrap, priority:300
 msgid "--force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/fetch-options.txt:84
+#: en/fetch-options.txt:93
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:87
+#: en/fetch-options.txt:96
 #, no-wrap, priority:220
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5821,397 +5839,397 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:90
+#: en/fetch-options.txt:99
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:101
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:93 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:184
+#: en/fetch-options.txt:102 en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:74 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:158 en/git-stash.txt:186
 #, ignore-same, no-wrap, priority:280
 msgid "-k"
 msgstr "-k"
 
 #. type: Labeled list
-#: en/fetch-options.txt:94 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
+#: en/fetch-options.txt:103 en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:85
 #, ignore-same, no-wrap, priority:280
 msgid "--keep"
 msgstr "--keep"
 
 #. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:105
 #, priority:220
 msgid "Keep downloaded pack."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:98
+#: en/fetch-options.txt:107
 #, ignore-same, no-wrap, priority:220
 msgid "--multiple"
 msgstr "--multiple"
 
 #. type: Plain text
-#: en/fetch-options.txt:101
+#: en/fetch-options.txt:110
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:111
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-maintenance"
 msgstr "--[no-]auto-maintenance"
 
 #. type: Labeled list
-#: en/fetch-options.txt:103
+#: en/fetch-options.txt:112
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
 msgstr "--[no-]auto-gc"
 
 #. type: Plain text
-#: en/fetch-options.txt:107
+#: en/fetch-options.txt:116
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:108
+#: en/fetch-options.txt:117
 #, ignore-same, no-wrap, priority:220
 msgid "--[no-]write-commit-graph"
 msgstr "--[no-]write-commit-graph"
 
 #. type: Plain text
-#: en/fetch-options.txt:111
+#: en/fetch-options.txt:120
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:122
 #, ignore-same, no-wrap, priority:220
 msgid "--prefetch"
 msgstr "--prefetch"
 
 #. type: Plain text
-#: en/fetch-options.txt:117
+#: en/fetch-options.txt:126
 #, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:119 en/git-push.txt:153
+#: en/fetch-options.txt:128 en/git-push.txt:153
 #, ignore-same, no-wrap, priority:220
 msgid "--prune"
 msgstr "--prune"
 
 #. type: Plain text
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:138
 #, 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:132 en/fetch-options.txt:143
+#: en/fetch-options.txt:141 en/fetch-options.txt:152
 #, priority:220
 msgid "See the PRUNING section below for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:133 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
+#: en/fetch-options.txt:142 en/git-cvsexportcommit.txt:57 en/git-grep.txt:134 en/git.txt:130 en/rev-list-options.txt:92
 #, no-wrap, priority:260
 msgid "-P"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:134
+#: en/fetch-options.txt:143
 #, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
 msgstr "--prune-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:141
+#: en/fetch-options.txt:150
 #, 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:147 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
+#: en/fetch-options.txt:156 en/git-add.txt:69 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:148 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:147 en/git-mailinfo.txt:68 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:403 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:218 en/merge-options.txt:83
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
 
 #. type: Labeled list
-#: en/fetch-options.txt:149 en/git-clone.txt:260
+#: en/fetch-options.txt:158 en/git-clone.txt:260
 #, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
 msgstr "--no-tags"
 
 #. type: Plain text
-#: en/fetch-options.txt:155
+#: en/fetch-options.txt:164
 #, 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:156
+#: en/fetch-options.txt:165
 #, no-wrap, priority:220
 msgid "--refmap=<refspec>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:175
 #, 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.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:168 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:177 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:175
+#: en/fetch-options.txt:184
 #, 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:177
+#: en/fetch-options.txt:186
 #, no-wrap, priority:220
 msgid "--recurse-submodules[=yes|on-demand|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:197
 #, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:199
 #, ignore-same, no-wrap, priority:220
 msgid "-j"
 msgstr "-j"
 
 #. type: Labeled list
-#: en/fetch-options.txt:191
+#: en/fetch-options.txt:200
 #, no-wrap, priority:220
 msgid "--jobs=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:202
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:198
+#: en/fetch-options.txt:207
 #, 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:201
+#: en/fetch-options.txt:210
 #, 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:203 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:212 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
 #, ignore-same, no-wrap, priority:280
 msgid "--no-recurse-submodules"
 msgstr "--no-recurse-submodules"
 
 #. type: Plain text
-#: en/fetch-options.txt:206
+#: en/fetch-options.txt:215
 #, 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:208 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:217 en/git-branch.txt:227 en/git-push.txt:373
 #, ignore-same, no-wrap, priority:260
 msgid "--set-upstream"
 msgstr "--set-upstream"
 
 #. type: Plain text
-#: en/fetch-options.txt:214
+#: en/fetch-options.txt:223
 #, priority:220
 msgid "If the remote is fetched successfully, 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:216
+#: en/fetch-options.txt:225
 #, no-wrap, priority:220
 msgid "--submodule-prefix=<path>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:220
+#: en/fetch-options.txt:229
 #, 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:221
+#: en/fetch-options.txt:230
 #, no-wrap, priority:220
 msgid "--recurse-submodules-default=[yes|on-demand]"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:237
 #, 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:230
+#: en/fetch-options.txt:239
 #, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
 msgstr "--update-head-ok"
 
 #. type: Plain text
-#: en/fetch-options.txt:237
+#: en/fetch-options.txt:246
 #, 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:239 en/git-clone.txt:209
+#: en/fetch-options.txt:248 en/git-clone.txt:209
 #, no-wrap, priority:300
 msgid "--upload-pack <upload-pack>"
 msgstr ""
 
 #. type: Plain text
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:253
 #, 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:246 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:223 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
+#: en/fetch-options.txt:255 en/git-am.txt:77 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:124 en/git-commit.txt:368 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:360 en/git-grep.txt:285 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:183 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:391 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:75 en/git-show-ref.txt:70 en/git-stash.txt:225 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:228 en/merge-options.txt:137
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
 
 #. type: Plain text
-#: en/fetch-options.txt:251
+#: en/fetch-options.txt:260
 #, 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:252 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
+#: en/fetch-options.txt:261 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:129 en/git-commit.txt:353 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:109 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:141 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:391 en/git-read-tree.txt:63 en/git-rebase.txt:395 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:232 en/merge-options.txt:141
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:253 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
+#: en/fetch-options.txt:262 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:130 en/git-commit.txt:354 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:392 en/git-rebase.txt:396 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:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:233 en/merge-options.txt:142
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: Plain text
-#: en/fetch-options.txt:255 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:264 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
 #, priority:300
 msgid "Be verbose."
 msgstr "屋녕눗蘊뉓쮭��"
 
 #. type: Labeled list
-#: en/fetch-options.txt:257 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:266 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:134 en/git-format-patch.txt:388 en/git-pack-objects.txt:161 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
 #, ignore-same, no-wrap, priority:300
 msgid "--progress"
 msgstr "--progress"
 
 #. type: Plain text
-#: en/fetch-options.txt:262 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
+#: en/fetch-options.txt:271 en/git-bundle.txt:89 en/git-pack-objects.txt:166 en/git-push.txt:400
 #, 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:263 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:272 en/git-ls-remote.txt:75 en/git-push.txt:215
 #, no-wrap, priority:220
 msgid "-o <option>"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:264 en/git-clone.txt:140 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:273 en/git-clone.txt:140 en/git-ls-remote.txt:76
 #, no-wrap, priority:300
 msgid "--server-option=<option>"
 msgstr "--server-option=<�면쟿>"
 
 #. type: Plain text
-#: en/fetch-options.txt:271 en/git-clone.txt:147
+#: en/fetch-options.txt:280 en/git-clone.txt:147
 #, 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:272
+#: en/fetch-options.txt:281
 #, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
 msgstr "--show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:277
+#: en/fetch-options.txt:286
 #, 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:278
+#: en/fetch-options.txt:287
 #, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
 msgstr "--no-show-forced-updates"
 
 #. type: Plain text
-#: en/fetch-options.txt:284
+#: en/fetch-options.txt:293
 #, 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:285 en/git-push.txt:422
+#: en/fetch-options.txt:294 en/git-push.txt:422
 #, ignore-same, no-wrap, priority:220
 msgid "-4"
 msgstr "-4"
 
 #. type: Labeled list
-#: en/fetch-options.txt:286 en/git-push.txt:423
+#: en/fetch-options.txt:295 en/git-push.txt:423
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
 msgstr "--ipv4"
 
 #. type: Plain text
-#: en/fetch-options.txt:288 en/git-push.txt:425
+#: en/fetch-options.txt:297 en/git-push.txt:425
 #, priority:220
 msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:289 en/git-push.txt:426
+#: en/fetch-options.txt:298 en/git-push.txt:426
 #, ignore-same, no-wrap, priority:220
 msgid "-6"
 msgstr "-6"
 
 #. type: Labeled list
-#: en/fetch-options.txt:290 en/git-push.txt:427
+#: en/fetch-options.txt:299 en/git-push.txt:427
 #, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
 msgstr "--ipv6"
 
 #. type: Plain text
-#: en/fetch-options.txt:291 en/git-push.txt:429
+#: en/fetch-options.txt:300 en/git-push.txt:429
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
 msgstr ""
@@ -6299,13 +6317,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "linkgit:git-commit[1] �뷴룱訝�葉�컜�㎩��졾뀯�경룓雅ㅴ릎�꾢걳力뺛��"
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:75 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:40 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:116 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:29 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-bugreport.txt:40 en/git-bundle.txt:38 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:106 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:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:76 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:40 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:120 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:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 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:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 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-mktag.txt:41 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-range-diff.txt:45 en/git-read-tree.txt:33 en/git-rebase.txt:204 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:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 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-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 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:158 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "�면쟿"
 
 #. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:235 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:400 en/git-grep.txt:298 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:33 en/git-stash.txt:237 en/git-status.txt:152
 #, ignore-ellipsis, no-wrap, priority:300
 msgid "<pathspec>..."
 msgstr "<茹붹죭瓮�풌>..."
@@ -6335,7 +6353,7 @@ msgid "Allow adding otherwise ignored files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:131 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:499 en/git-repack.txt:165 en/git-tag.txt:130 en/rev-list-options.txt:73
 #, ignore-same, no-wrap, priority:300
 msgid "-i"
 msgstr "-i"
@@ -6365,13 +6383,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:261 en/git-grep.txt:265 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:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:259 en/git-config.txt:268 en/git-grep.txt:265 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:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:260 en/git-config.txt:269 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"
@@ -6545,31 +6563,31 @@ msgid "Override the executable bit of the added files.  The executable bit is on
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:206
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:321 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:80 en/git-stash.txt:208
 #, no-wrap, priority:300
 msgid "--pathspec-from-file=<file>"
 msgstr "--pathspec-from-file=<file>"
 
 #. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:215
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:328 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:87 en/git-stash.txt:217
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:216
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:329 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:88 en/git-stash.txt:218
 #, ignore-same, no-wrap, priority:300
 msgid "--pathspec-file-nul"
 msgstr "--pathspec-file-nul"
 
 #. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:222
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:333 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:92 en/git-stash.txt:224
 #, priority:300
 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:230 en/git-update-index.txt:226 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36
 #, no-wrap, priority:300
 msgid "\\--"
 msgstr ""
@@ -6581,7 +6599,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:373 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:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:124 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 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:61 en/git-stash.txt:271 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:325 en/git-column.txt:50 en/git-commit.txt:409 en/git-config.txt:379 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:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:292 en/git-format-patch.txt:699 en/git-grep.txt:306 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:269 en/git-log.txt:126 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 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:203 en/git-push.txt:594 en/git-range-diff.txt:131 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-list.txt:35 en/git-rev-parse.txt:456 en/git-rm.txt:169 en/git-send-email.txt:494 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:273 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "影꾡풃"
@@ -6935,7 +6953,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:212 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:357 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:249 en/git-annotate.txt:28 en/git-apply.txt:281 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:576 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:413 en/git-format-patch.txt:752 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 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:260 en/git-repack.txt:214 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:193 en/git-send-email.txt:536 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:359 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1033 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6947,13 +6965,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:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:529 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 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:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:243 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:217 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:529 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:365 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:253 en/git-annotate.txt:32 en/git-apply.txt:285 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:319 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:363 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:584 en/git-config.txt:535 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:417 en/git-format-patch.txt:756 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 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:61 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:130 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:257 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:119 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:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:442 en/git-rebase.txt:1301 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:266 en/git-repack.txt:219 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:197 en/git-send-email.txt:540 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:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:367 en/git-status.txt:454 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1041 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 en/git-update-ref.txt:179 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:530 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 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:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:244 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:218 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:530 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:366 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:254 en/git-annotate.txt:33 en/git-apply.txt:286 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:320 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:364 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:585 en/git-config.txt:536 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:418 en/git-format-patch.txt:757 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 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:62 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:131 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:258 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:120 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:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:443 en/git-rebase.txt:1302 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:267 en/git-repack.txt:220 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:198 en/git-send-email.txt:541 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:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:368 en/git-status.txt:455 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1042 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 en/git-update-ref.txt:180 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7391,7 +7409,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw
 msgstr ""
 
 #. type: Title -
-#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:181 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:378 en/git-show.txt:84 en/git-stash.txt:253 en/git-tag.txt:231
+#: en/git-am.txt:193 en/git-commit.txt:540 en/git-format-patch.txt:416 en/git-fsck.txt:113 en/git-log.txt:183 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:378 en/git-show.txt:84 en/git-stash.txt:255 en/git-tag.txt:231
 #, no-wrap, priority:280
 msgid "DISCUSSION"
 msgstr ""
@@ -7603,7 +7621,7 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
 msgstr ""
 
 #. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:176
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:178
 #, ignore-same, no-wrap, priority:240
 msgid "--index"
 msgstr "--index"
@@ -7903,7 +7921,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
 msgstr ""
 
 #. type: Title -
-#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:192 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
+#: en/git-apply.txt:255 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:284 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:392 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:335 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:188 en/git-mergetool.txt:103 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:415 en/git-range-diff.txt:124 en/git-rebase.txt:1272 en/git-repack.txt:194 en/git-send-email.txt:455 en/git-status.txt:414 en/git-svn.txt:1065 en/git-tag.txt:215 en/git-update-index.txt:524
 #, no-wrap, priority:280
 msgid "CONFIGURATION"
 msgstr ""
@@ -8173,7 +8191,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:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:175 en/git-show-branch.txt:80 en/git-tag.txt:100
 #, ignore-same, no-wrap, priority:260
 msgid "--list"
 msgstr "--list"
@@ -8312,7 +8330,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:133
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -12278,7 +12296,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:229 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:231 en/git-switch.txt:146
 #, priority:240
 msgid "Quiet, suppress feedback messages."
 msgstr ""
@@ -12662,7 +12680,7 @@ msgid "Limits the paths affected by the operation."
 msgstr ""
 
 #. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:244
+#: en/git-checkout.txt:369 en/git-commit.txt:407 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:47 en/git-stash.txt:246
 #, priority:280
 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
 msgstr ""
@@ -14084,7 +14102,7 @@ msgid "This default configuration is achieved by creating references to the remo
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:131 en/git-instaweb.txt:24 en/git-pack-objects.txt:152 en/git-svn.txt:245
 #, ignore-same, no-wrap, priority:300
 msgid "--local"
 msgstr "--local"
@@ -14877,7 +14895,7 @@ msgid "Discussion"
 msgstr ""
 
 #. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
+#: en/git-commit-tree.txt:91 en/git-commit.txt:566 en/git-config.txt:291 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1138
 #, no-wrap, priority:280
 msgid "FILES"
 msgstr ""
@@ -14983,7 +15001,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-commit.txt:78
 #, priority:280
-msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgid "Use the interactive patch selection interface to choose which changes to commit. See linkgit:git-add[1] for details."
 msgstr ""
 
 #. type: Labeled list
@@ -15113,7 +15131,7 @@ msgid "When doing a dry-run, give the output in a porcelain-ready format. See li
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:154 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:154 en/git-describe.txt:88 en/git-ls-tree.txt:52 en/git-status.txt:47
 #, ignore-same, no-wrap, priority:280
 msgid "--long"
 msgstr "--long"
@@ -15125,7 +15143,7 @@ msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry
 msgstr ""
 
 #. type: Labeled list
-#: en/git-commit.txt:159 en/git-config.txt:216 en/git-grep.txt:176
+#: en/git-commit.txt:159 en/git-config.txt:223 en/git-grep.txt:176
 #, ignore-same, no-wrap, priority:280
 msgid "--null"
 msgstr "--null"
@@ -15836,557 +15854,551 @@ msgid "On success, the command returns the exit code 0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:78
 #, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
 msgstr "--replace-all"
 
 #. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:81
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:44
+#: en/git-config.txt:82 en/git-update-index.txt:44
 #, ignore-same, no-wrap, priority:100
 msgid "--add"
 msgstr "--add"
 
 #. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:86
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:87
 #, ignore-same, no-wrap, priority:100
 msgid "--get"
 msgstr "--get"
 
 #. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:91
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:92
 #, ignore-same, no-wrap, priority:100
 msgid "--get-all"
 msgstr "--get-all"
 
 #. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:94
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:95
 #, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
 msgstr "--get-regexp"
 
 #. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:101
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:102
 #, no-wrap, priority:100
 msgid "--get-urlmatch name URL"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:109
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:110
 #, ignore-same, no-wrap, priority:100
 msgid "--global"
 msgstr "--global"
 
 #. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:115
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:118
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:353
+#: en/git-config.txt:120 en/git-config.txt:130 en/git-config.txt:139 en/git-config.txt:154 en/git-config.txt:353
 #, priority:100
 msgid "See also <<FILES>>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:121
 #, ignore-same, no-wrap, priority:100
 msgid "--system"
 msgstr "--system"
 
 #. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:125
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:128
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:134
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:137
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:140 en/git-restore.txt:59
 #, ignore-same, no-wrap, priority:280
 msgid "--worktree"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:144
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:145
 #, no-wrap, priority:100
 msgid "-f config-file"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:146
 #, no-wrap, priority:100
 msgid "--file config-file"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:149
+#, priority:100
+msgid "For writing options: write to the specified file rather than the repository `.git/config`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:152
 #, priority:100
-msgid "Use the given config file instead of the one specified by GIT_CONFIG."
+msgid "For reading options: read only from the specified file rather than from all available files."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:155
 #, no-wrap, priority:100
 msgid "--blob blob"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:161
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:162
 #, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
 msgstr "--remove-section"
 
 #. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:164
 #, priority:100
 msgid "Remove the given section from the configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:165
 #, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
 msgstr "--rename-section"
 
 #. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:167
 #, priority:100
 msgid "Rename the given section to a new name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:168
 #, ignore-same, no-wrap, priority:100
 msgid "--unset"
 msgstr "--unset"
 
 #. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:170
 #, priority:100
 msgid "Remove the line matching the key from config file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:171
 #, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
 msgstr "--unset-all"
 
 #. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:173
 #, priority:100
 msgid "Remove all lines matching the key from config file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:177
 #, priority:100
 msgid "List all variables set in config file, along with their values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:171
+#: en/git-config.txt:178
 #, ignore-same, no-wrap, priority:100
 msgid "--fixed-value"
 msgstr "--fixed-value"
 
 #. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:183
 #, priority:100
 msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:184
 #, no-wrap, priority:100
 msgid "--type <type>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:188
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:190
 #, priority:100
 msgid "Valid `<type>`'s include:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:192
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:195
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:197
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:201
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:203
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:207
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:209
 #, ignore-same, no-wrap, priority:100
 msgid "--bool"
 msgstr "--bool"
 
 #. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:210
 #, ignore-same, no-wrap, priority:100
 msgid "--int"
 msgstr "--int"
 
 #. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:211
 #, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
 msgstr "--bool-or-int"
 
 #. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:212 en/git-hash-object.txt:39
 #, ignore-same, no-wrap, priority:100
 msgid "--path"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:213
 #, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
 msgstr "--expiry-date"
 
 #. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:216
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-type"
 msgstr "--no-type"
 
 #. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:221
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:230
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:234
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:235
 #, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
 msgstr "--show-origin"
 
 #. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:240
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:241
 #, ignore-same, no-wrap, priority:100
 msgid "--show-scope"
 msgstr "--show-scope"
 
 #. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:245
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:246
 #, no-wrap, priority:100
 msgid "--get-colorbool name [stdout-is-tty]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:256
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:257
 #, no-wrap, priority:100
 msgid "--get-color name [default]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:263
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:267
 #, priority:100
 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:265
+#: en/git-config.txt:272
 #, 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:266
+#: en/git-config.txt:273
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
 msgstr "--[no-]includes"
 
 #. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:278
 #, 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:272
+#: en/git-config.txt:279
 #, no-wrap, priority:100
 msgid "--default <value>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:282
 #, 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:281
+#: en/git-config.txt:288
 #, 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:288
+#: en/git-config.txt:295
 #, 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:289
+#: en/git-config.txt:296
 #, no-wrap, priority:100
 msgid "$(prefix)/etc/gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:298
 #, priority:100
 msgid "System-wide configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:299
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:306
 #, 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:300
+#: en/git-config.txt:307
 #, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:310
 #, priority:100
 msgid "User-specific configuration file. Also called \"global\" configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:311
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:313
 #, priority:100
 msgid "Repository specific configuration file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:314
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config.worktree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:317
 #, 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:316
+#: en/git-config.txt:323
 #, 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:320
+#: en/git-config.txt:327
 #, 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:323
+#: en/git-config.txt:330
 #, 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:327
+#: en/git-config.txt:334
 #, 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:333
+#: en/git-config.txt:338
 #, 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."
+msgid "You can override these rules using the `--global`, `--system`, `--local`, `--worktree`, and `--file` command-line options; see <<OPTIONS>> above."
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:336 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:341 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
 #, no-wrap, priority:280
 msgid "ENVIRONMENT"
 msgstr ""
 
-#. type: Labeled list
-#: en/git-config.txt:338
-#, ignore-same, no-wrap, priority:100
-msgid "GIT_CONFIG"
-msgstr "GIT_CONFIG"
-
-#. type: Plain text
-#: en/git-config.txt:342
-#, 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:343
 #, ignore-same, no-wrap, priority:100
@@ -16449,14 +16461,26 @@ msgstr ""
 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-config.txt:370
+#, ignore-same, no-wrap, priority:100
+msgid "GIT_CONFIG"
+msgstr "GIT_CONFIG"
+
 #. type: Plain text
 #: en/git-config.txt:376
 #, priority:100
+msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:382
+#, priority:100
 msgid "Given a .git/config like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:383
+#: en/git-config.txt:389
 #, no-wrap, priority:100
 msgid ""
 "#\n"
@@ -16467,7 +16491,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:388 en/git.txt:353
+#: en/git-config.txt:394 en/git.txt:353
 #, no-wrap, priority:100
 msgid ""
 "; core variables\n"
@@ -16477,7 +16501,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:393
+#: en/git-config.txt:399
 #, no-wrap, priority:100
 msgid ""
 "; Our diff algorithm\n"
@@ -16487,7 +16511,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:404
 #, no-wrap, priority:100
 msgid ""
 "; Proxy settings\n"
@@ -16497,7 +16521,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:411
 #, no-wrap, priority:100
 msgid ""
 "; HTTP\n"
@@ -16509,157 +16533,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:414
 #, priority:100
 msgid "you can set the filemode to true with"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:417
 #, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:422
 #, 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:419
+#: en/git-config.txt:425
 #, 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:422
+#: en/git-config.txt:428
 #, 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:424
+#: en/git-config.txt:430
 #, priority:100
 msgid "To delete the entry for renames, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:433
 #, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:431
+#: en/git-config.txt:437
 #, 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:433
+#: en/git-config.txt:439
 #, priority:100
 msgid "To query the value for a given key, do"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:436
+#: en/git-config.txt:442
 #, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:439 en/git-merge-index.txt:66
+#: en/git-config.txt:445 en/git-merge-index.txt:66
 #, priority:100
 msgid "or"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:442
+#: en/git-config.txt:448
 #, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:451
 #, priority:100
 msgid "or, to query a multivar:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:448
+#: en/git-config.txt:454
 #, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:451
+#: en/git-config.txt:457
 #, priority:100
 msgid "If you want to know all the values for a multivar, do:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:454
+#: en/git-config.txt:460
 #, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:458
+#: en/git-config.txt:464
 #, 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:461
+#: en/git-config.txt:467
 #, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:465
+#: en/git-config.txt:471
 #, 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:468
+#: en/git-config.txt:474
 #, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:471
+#: en/git-config.txt:477
 #, priority:100
 msgid "To actually match only values with an exclamation mark, you have to"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:474
+#: en/git-config.txt:480
 #, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:477
+#: en/git-config.txt:483
 #, priority:100
 msgid "To add a new proxy, without altering any of the existing ones, use"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:486
 #, no-wrap, priority:100
 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:484
+#: en/git-config.txt:490
 #, priority:100
 msgid "An example to use customized color from the configuration in your script:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:496
 #, no-wrap, priority:100
 msgid ""
 "#!/bin/sh\n"
@@ -16669,13 +16693,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:494
+#: en/git-config.txt:500
 #, 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:503
+#: en/git-config.txt:509
 #, no-wrap, priority:100
 msgid ""
 "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16688,19 +16712,19 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:508 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
+#: en/git-config.txt:514 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1278 en/git-replace.txt:139 en/git-rm.txt:184 en/git-svn.txt:1151 en/git-worktree.txt:485
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:513
+#: en/git-config.txt:519
 #, 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:517
+#: en/git-config.txt:523
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -16708,13 +16732,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-config.txt:520
+#: en/git-config.txt:526
 #, priority:100
 msgid "and running `git config section.Subsection.key value2` will result in"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-config.txt:525
+#: en/git-config.txt:531
 #, no-wrap, priority:100
 msgid ""
 "  [section.subsection]\n"
@@ -19350,103 +19374,103 @@ msgid "Instead of finding the tag that predates the commit, find the tag that co
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:70
+#: en/git-describe.txt:71
 #, priority:260
-msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name.  An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:71
+#: en/git-describe.txt:72
 #, no-wrap, priority:260
 msgid "--candidates=<n>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:77
+#: en/git-describe.txt:78
 #, priority:260
 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates.  Increasing <n> above 10 will take slightly longer but may produce a more accurate result.  An <n> of 0 will cause only exact matches to be output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:78
+#: en/git-describe.txt:79
 #, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
 msgstr "--exact-match"
 
 #. type: Plain text
-#: en/git-describe.txt:81
+#: en/git-describe.txt:82
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:167
+#: en/git-describe.txt:83 en/git-ls-files.txt:167
 #, ignore-same, no-wrap, priority:260
 msgid "--debug"
 msgstr "--debug"
 
 #. type: Plain text
-#: en/git-describe.txt:86
+#: en/git-describe.txt:87
 #, priority:260
 msgid "Verbosely display information about the searching strategy being employed to standard error.  The tag name will still be printed to standard out."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:95
+#: en/git-describe.txt:96
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-describe.txt:96
+#: en/git-describe.txt:97
 #, no-wrap, priority:260
 msgid "--match <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:105
+#: en/git-describe.txt:106
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:106
+#: en/git-describe.txt:107
 #, no-wrap, priority:260
 msgid "--exclude <pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:117
+#: en/git-describe.txt:118
 #, priority:260
 msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:119 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--always"
 msgstr "--always"
 
 #. type: Plain text
-#: en/git-describe.txt:120 en/git-name-rev.txt:63
+#: en/git-describe.txt:121 en/git-name-rev.txt:63
 #, priority:260
 msgid "Show uniquely abbreviated commit object as fallback."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:125
+#: en/git-describe.txt:126
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This is useful when you wish to not match tags on branches merged in the history of the target commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:130
+#: en/git-describe.txt:131
 #, priority:260
 msgid "With something like git.git current tree, I get:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:133
+#: en/git-describe.txt:134
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe parent\n"
@@ -19454,25 +19478,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:139
+#: en/git-describe.txt:140
 #, priority:260
 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\")  at the end."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:147
+#: en/git-describe.txt:151
 #, 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\" + 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."
+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\" + an unambigous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7.  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
-#: en/git-describe.txt:149
+#: en/git-describe.txt:153
 #, priority:260
 msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:152
+#: en/git-describe.txt:156
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe v1.0.4\n"
@@ -19480,13 +19504,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:155
+#: en/git-describe.txt:159
 #, priority:260
 msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:158
+#: en/git-describe.txt:162
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
@@ -19494,7 +19518,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:161
+#: en/git-describe.txt:165
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
@@ -19502,13 +19526,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:164
+#: en/git-describe.txt:168
 #, priority:260
 msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:167
+#: en/git-describe.txt:171
 #, no-wrap, priority:260
 msgid ""
 "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
@@ -19516,37 +19540,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:173
+#: en/git-describe.txt:177
 #, priority:260
 msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
 msgstr ""
 
 #. type: Title -
-#: en/git-describe.txt:176
+#: en/git-describe.txt:180
 #, no-wrap, priority:260
 msgid "SEARCH STRATEGY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:183
+#: en/git-describe.txt:187
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:190
+#: en/git-describe.txt:194
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:196
+#: en/git-describe.txt:200
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-describe.txt:204
+#: en/git-describe.txt:208
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
 msgstr ""
@@ -19576,19 +19600,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:124
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:125
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:126
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -20176,7 +20200,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:138 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -20358,13 +20382,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-diff.txt:56
 #, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`."
 msgstr ""
 
 #. type: Labeled list
 #: en/git-diff.txt:57
 #, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
@@ -20373,110 +20397,116 @@ msgstr ""
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
+#. type: Plain text
+#: en/git-diff.txt:68
+#, priority:280
+msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD.  `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
+msgstr ""
+
 #. type: Labeled list
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:73
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:73
+#: en/git-diff.txt:77
 #, priority:280
 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side.  `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:78
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:86
 #, priority:280
 msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the `^@` suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:87
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:93
 #, priority:280
 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:94
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:101
 #, 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 ""
 
 #. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:106
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:113
 #, 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 ""
 
 #. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:114
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:118
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:132
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:137
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:142
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:149
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:155
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20485,31 +20515,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:158
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:162
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:163
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:169
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20518,31 +20548,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:173
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:176
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:184
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20551,31 +20581,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:187
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:188 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:191
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20584,31 +20614,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:203
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:204
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:205
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:210
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20616,19 +20646,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:214
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:215
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:225
 #, fuzzy, priority:280
 #| 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 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -27832,7 +27862,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
 msgstr ""
 
 #. type: Labeled list
-#: en/git-grep.txt:188 en/rev-list-options.txt:1131
+#: en/git-grep.txt:188 en/rev-list-options.txt:1139
 #, ignore-same, no-wrap, priority:260
 msgid "--count"
 msgstr "--count"
@@ -31280,373 +31310,373 @@ msgid "--decorate[=short|full|auto|no]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:43
+#: en/git-log.txt:45
 #, priority:260
-msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:44
+#: en/git-log.txt:46
 #, no-wrap, priority:260
 msgid "--decorate-refs=<pattern>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:45
+#: en/git-log.txt:47
 #, no-wrap, priority:260
 msgid "--decorate-refs-exclude=<pattern>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:53
+#: en/git-log.txt:55
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:54
+#: en/git-log.txt:56
 #, ignore-same, no-wrap, priority:260
 msgid "--source"
 msgstr "--source"
 
 #. type: Plain text
-#: en/git-log.txt:57
+#: en/git-log.txt:59
 #, priority:260
 msgid "Print out the ref name given on the command line by which each commit was reached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:58
+#: en/git-log.txt:60
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]mailmap"
 msgstr "--[no-]mailmap"
 
 #. type: Labeled list
-#: en/git-log.txt:59
+#: en/git-log.txt:61
 #, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
 msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
-#: en/git-log.txt:63
+#: en/git-log.txt:65
 #, priority:260
 msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:64
+#: en/git-log.txt:66
 #, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
 msgstr "--full-diff"
 
 #. type: Plain text
-#: en/git-log.txt:70
+#: en/git-log.txt:72
 #, 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 ""
 
 #. type: Plain text
-#: en/git-log.txt:73
+#: en/git-log.txt:75
 #, priority:260
 msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:74
+#: en/git-log.txt:76
 #, ignore-same, no-wrap, priority:260
 msgid "--log-size"
 msgstr "--log-size"
 
 #. type: Plain text
-#: en/git-log.txt:79
+#: en/git-log.txt:81
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:84 en/git-shortlog.txt:92
 #, no-wrap, priority:260
 msgid "<revision range>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:92
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:93 en/git-shortlog.txt:101
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "[--] <path>..."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:98
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:101 en/git-shortlog.txt:107
 #, priority:260
 msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
 msgstr ""
 
 #. type: Title -
-#: en/git-log.txt:105 en/git-show.txt:49
+#: en/git-log.txt:107 en/git-show.txt:49
 #, no-wrap, priority:260
 msgid "DIFF FORMATTING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:111
 #, priority:260
 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:118
 #, priority:260
 msgid "Note that unless one of `--diff-merges` variants (including short `-m`, `-c`, and `--cc` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is the default format."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:125
+#: en/git-log.txt:127
 #, no-wrap, priority:260
 msgid "`git log --no-merges`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:128
+#: en/git-log.txt:130
 #, priority:260
 msgid "Show the whole commit history, but skip any merges"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:129
+#: en/git-log.txt:131
 #, no-wrap, priority:260
 msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:133
+#: en/git-log.txt:135
 #, priority:260
 msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:134
+#: en/git-log.txt:136
 #, no-wrap, priority:260
 msgid "`git log --since=\"2 weeks ago\" -- gitk`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:139
+#: en/git-log.txt:141
 #, priority:260
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:140
+#: en/git-log.txt:142
 #, no-wrap, priority:260
 msgid "`git log --name-status release..test`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:145
+#: en/git-log.txt:147
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:148
 #, no-wrap, priority:260
 msgid "`git log --follow builtin/rev-list.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:151
+#: en/git-log.txt:153
 #, priority:260
 msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:152
+#: en/git-log.txt:154
 #, no-wrap, priority:260
 msgid "`git log --branches --not --remotes=origin`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:159
 #, priority:260
 msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:160
 #, no-wrap, priority:260
 msgid "`git log master --not --remotes=*/master`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:164
 #, priority:260
 msgid "Shows all commits that are in local master but not in any remote repository master branches."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:163
+#: en/git-log.txt:165
 #, no-wrap, priority:260
 msgid "`git log -p -m --first-parent`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:170
+#: en/git-log.txt:172
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:171
+#: en/git-log.txt:173
 #, no-wrap, priority:260
 msgid "`git log -L '/int main/',/^}/:main.c`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:175
+#: en/git-log.txt:177
 #, priority:260
 msgid "Shows how the function `main()` in the file `main.c` evolved over time."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:176
+#: en/git-log.txt:178
 #, no-wrap, priority:260
 msgid "`git log -3`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:179
+#: en/git-log.txt:181
 #, priority:260
 msgid "Limits the number of commits to show to 3."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:192
 #, priority:260
 msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:191
+#: en/git-log.txt:193
 #, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
 msgstr "format.pretty"
 
 #. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:196
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:197
 #, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
 msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
-#: en/git-log.txt:199
+#: en/git-log.txt:201
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:200
+#: en/git-log.txt:202
 #, ignore-same, no-wrap, priority:260
 msgid "log.date"
 msgstr "log.date"
 
 #. type: Plain text
-#: en/git-log.txt:204
+#: en/git-log.txt:206
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:208
+#: en/git-log.txt:210
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:209
+#: en/git-log.txt:211
 #, ignore-same, no-wrap, priority:260
 msgid "log.follow"
 msgstr "log.follow"
 
 #. type: Plain text
-#: en/git-log.txt:214
+#: en/git-log.txt:216
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:215
+#: en/git-log.txt:217
 #, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
 msgstr "log.showRoot"
 
 #. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:222
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:223
 #, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
 msgstr "log.showSignature"
 
 #. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:226
 #, priority:260
 msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:225
+#: en/git-log.txt:227
 #, no-wrap, priority:260
 msgid "mailmap.*"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:227
+#: en/git-log.txt:229
 #, priority:260
 msgid "See linkgit:git-shortlog[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-log.txt:228 en/git-notes.txt:333
+#: en/git-log.txt:230 en/git-notes.txt:333
 #, no-wrap, priority:280
 msgid "notes.displayRef"
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:233
+#: en/git-log.txt:235
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:237
+#: en/git-log.txt:239
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-log.txt:241
+#: en/git-log.txt:243
 #, priority:260
 msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
 msgstr ""
@@ -36753,7 +36783,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pack-objects.txt:135
 #, priority:100
-msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
@@ -36769,7 +36799,7 @@ msgid "This flag causes an object already in a local pack that has a .keep file
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:141 en/git-repack.txt:143
+#: en/git-pack-objects.txt:141 en/git-repack.txt:145
 #, no-wrap, priority:100
 msgid "--keep-pack=<pack-name>"
 msgstr ""
@@ -36973,7 +37003,7 @@ msgid "Omit objects that are known to be in the promisor remote.  (This option h
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:157
+#: en/git-pack-objects.txt:303 en/git-repack.txt:159
 #, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
 msgstr "--keep-unreachable"
@@ -37009,7 +37039,7 @@ msgid "Keep unreachable objects in loose form. This implies `--revs`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-pack-objects.txt:316 en/git-repack.txt:164
+#: en/git-pack-objects.txt:316 en/git-repack.txt:166
 #, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
 msgstr "--delta-islands"
@@ -37118,7 +37148,7 @@ msgid "Note that we pick a single island for each regex to go into, using \"last
 msgstr ""
 
 #. type: Plain text
-#: en/git-pack-objects.txt:419 en/git-repack.txt:196
+#: en/git-pack-objects.txt:419 en/git-repack.txt:198
 #, priority:100
 msgid "Various configuration variables affect packing, see linkgit:git-config[1] (search for \"pack\" and \"delta\")."
 msgstr ""
@@ -37674,7 +37704,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-pull.txt:121
 #, priority:220
-msgid "When false, merge the current branch into the upstream branch."
+msgid "When false, merge the upstream branch into the current branch."
 msgstr ""
 
 #. type: Plain text
@@ -38158,7 +38188,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
-msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
+msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with their commit, and blindly pushing with `--force` will lose their work."
 msgstr ""
 
 #. type: Plain text
@@ -43302,115 +43332,115 @@ msgid "This option provides an additional limit on top of `--window`; the window
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:125
+#: en/git-repack.txt:127
 #, priority:100
-msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:127
+#: en/git-repack.txt:129
 #, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
 msgstr "--write-bitmap-index"
 
 #. type: Plain text
-#: en/git-repack.txt:133
+#: en/git-repack.txt:135
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:134
+#: en/git-repack.txt:136
 #, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
 msgstr "--pack-kept-objects"
 
 #. type: Plain text
-#: en/git-repack.txt:142
+#: en/git-repack.txt:144
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:149
+#: en/git-repack.txt:151
 #, priority:100
 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
-#: en/git-repack.txt:150
+#: en/git-repack.txt:152
 #, no-wrap, priority:100
 msgid "--unpack-unreachable=<when>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:155
+#: en/git-repack.txt:157
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:162
+#: en/git-repack.txt:164
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:167
+#: en/git-repack.txt:169
 #, priority:100
 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:168
+#: en/git-repack.txt:170
 #, no-wrap, priority:100
 msgid "-g=<factor>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-repack.txt:169
+#: en/git-repack.txt:171
 #, no-wrap, priority:100
 msgid "--geometric=<factor>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:173
+#: en/git-repack.txt:175
 #, priority:100
 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:179
+#: en/git-repack.txt:181
 #, priority:100
 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:184
+#: en/git-repack.txt:186
 #, priority:100
 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:190
+#: en/git-repack.txt:192
 #, priority:100
 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:206
+#: en/git-repack.txt:208
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:210
+#: en/git-repack.txt:212
 #, priority:100
 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false."
 msgstr ""
 
 #. type: Plain text
-#: en/git-repack.txt:215
+#: en/git-repack.txt:217
 #, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
@@ -44483,7 +44513,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
 msgstr ""
 
 #. type: Labeled list
-#: en/git-reset.txt:256 en/git-stash.txt:294
+#: en/git-reset.txt:256 en/git-stash.txt:296
 #, no-wrap, priority:280
 msgid "Interrupted workflow"
 msgstr ""
@@ -46869,521 +46899,539 @@ msgstr ""
 #. type: Labeled list
 #: en/git-send-email.txt:170
 #, no-wrap, priority:100
+msgid "--sendmail-cmd=<command>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:177
+#, priority:100
+msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option.  The command will be executed in the shell if necessary.  Default is the value of `sendemail.sendmailcmd`.  If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:178
+#, no-wrap, priority:100
 msgid "--smtp-encryption=<encryption>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:174
+#: en/git-send-email.txt:182
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:175
+#: en/git-send-email.txt:183
 #, no-wrap, priority:100
 msgid "--smtp-domain=<FQDN>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:181
+#: en/git-send-email.txt:189
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:182
+#: en/git-send-email.txt:190
 #, no-wrap, priority:100
 msgid "--smtp-auth=<mechanisms>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:185
+#: en/git-send-email.txt:193
 #, priority:100
 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-send-email.txt:188
+#: en/git-send-email.txt:196
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:196
+#: en/git-send-email.txt:204
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:197
+#: en/git-send-email.txt:205
 #, no-wrap, priority:100
 msgid "--smtp-pass[=<password>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:202
+#: en/git-send-email.txt:210
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:208
+#: en/git-send-email.txt:216
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:209
+#: en/git-send-email.txt:217
 #, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
 msgstr "--no-smtp-auth"
 
 #. type: Plain text
-#: en/git-send-email.txt:211
+#: en/git-send-email.txt:219
 #, priority:100
 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:212
+#: en/git-send-email.txt:220
 #, no-wrap, priority:100
 msgid "--smtp-server=<host>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:221
+#: en/git-send-email.txt:226
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise."
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:232
 #, priority:100
-msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
+msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  This method does not support passing arguments or using plain command names.  For those use cases, consider using `--sendmail-cmd` instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:222
+#: en/git-send-email.txt:233
 #, no-wrap, priority:100
 msgid "--smtp-server-port=<port>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:229
+#: en/git-send-email.txt:240
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:230
+#: en/git-send-email.txt:241
 #, no-wrap, priority:100
 msgid "--smtp-server-option=<option>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:234
+#: en/git-send-email.txt:245
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:238
+#: en/git-send-email.txt:249
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:239
+#: en/git-send-email.txt:250
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
 msgstr "--smtp-ssl"
 
 #. type: Plain text
-#: en/git-send-email.txt:241
+#: en/git-send-email.txt:252
 #, priority:100
 msgid "Legacy alias for '--smtp-encryption ssl'."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:242
+#: en/git-send-email.txt:253
 #, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
 msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
-#: en/git-send-email.txt:252
+#: en/git-send-email.txt:263
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:253
+#: en/git-send-email.txt:264
 #, no-wrap, priority:100
 msgid "--smtp-user=<user>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:257
+#: en/git-send-email.txt:268
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:258
+#: en/git-send-email.txt:269
 #, no-wrap, priority:100
 msgid "--smtp-debug=0|1"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:262
+#: en/git-send-email.txt:273
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:263
+#: en/git-send-email.txt:274
 #, no-wrap, priority:100
 msgid "--batch-size=<num>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:272
+#: en/git-send-email.txt:283
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:273
+#: en/git-send-email.txt:284
 #, no-wrap, priority:100
 msgid "--relogin-delay=<int>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:277
+#: en/git-send-email.txt:288
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:279
+#: en/git-send-email.txt:290
 #, no-wrap, priority:100
 msgid "Automating"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:281
+#: en/git-send-email.txt:292
 #, no-wrap, priority:100
 msgid "--no-[to|cc|bcc]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:284
+#: en/git-send-email.txt:295
 #, 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
+#: en/git-send-email.txt:296
 #, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
 msgstr "--no-identity"
 
 #. type: Plain text
-#: en/git-send-email.txt:288
+#: en/git-send-email.txt:299
 #, 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
+#: en/git-send-email.txt:300
 #, no-wrap, priority:100
 msgid "--to-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:294
+#: en/git-send-email.txt:305
 #, 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:295
+#: en/git-send-email.txt:306
 #, no-wrap, priority:100
 msgid "--cc-cmd=<command>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:311
 #, 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:301
+#: en/git-send-email.txt:312
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
 msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
-#: en/git-send-email.txt:308
+#: en/git-send-email.txt:319
 #, 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:309
+#: en/git-send-email.txt:320
 #, no-wrap, priority:100
 msgid "--identity=<identity>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:314
+#: en/git-send-email.txt:325
 #, 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:315
+#: en/git-send-email.txt:326
 #, 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:319
+#: en/git-send-email.txt:330
 #, priority:100
 msgid "If this is set, add emails found in the `Signed-off-by` trailer 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:320
+#: en/git-send-email.txt:331
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
 msgstr "--[no-]cc-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:325
+#: en/git-send-email.txt:336
 #, 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:326
+#: en/git-send-email.txt:337
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
 msgstr "--[no-]to-cover"
 
 #. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:342
 #, 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:332
+#: en/git-send-email.txt:343
 #, no-wrap, priority:100
 msgid "--suppress-cc=<category>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:346
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:338
+#: en/git-send-email.txt:349
 #, priority:100
 msgid "'author' will avoid including the patch author."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:339
+#: en/git-send-email.txt:350
 #, priority:100
 msgid "'self' will avoid including the sender."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:352
 #, 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:343
+#: en/git-send-email.txt:354
 #, 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:345
+#: en/git-send-email.txt:356
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:359
 #, 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:349
+#: en/git-send-email.txt:360
 #, priority:100
 msgid "'cccmd' will avoid running the --cc-cmd."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:350
+#: en/git-send-email.txt:361
 #, priority:100
 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:351
+#: en/git-send-email.txt:362
 #, priority:100
 msgid "'all' will suppress all auto cc values."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:356
+#: en/git-send-email.txt:367
 #, 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:357
+#: en/git-send-email.txt:368
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
 msgstr "--[no-]suppress-from"
 
 #. type: Plain text
-#: en/git-send-email.txt:361
+#: en/git-send-email.txt:372
 #, 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:362
+#: en/git-send-email.txt:373
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
 msgstr "--[no-]thread"
 
 #. type: Plain text
-#: en/git-send-email.txt:368
+#: en/git-send-email.txt:379
 #, 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:373
+#: en/git-send-email.txt:384
 #, 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:379
+#: en/git-send-email.txt:390
 #, 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:382
+#: en/git-send-email.txt:393
 #, no-wrap, priority:100
 msgid "Administering"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:395
 #, no-wrap, priority:100
 msgid "--confirm=<mode>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:397
 #, priority:100
 msgid "Confirm just before sending:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:389
+#: en/git-send-email.txt:400
 #, priority:100
 msgid "'always' will always confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:390
+#: en/git-send-email.txt:401
 #, priority:100
 msgid "'never' will never confirm before sending"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:392
+#: en/git-send-email.txt:403
 #, 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:393
+#: en/git-send-email.txt:404
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:405
 #, priority:100
 msgid "'auto' is equivalent to 'cc' + 'compose'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:399
+#: en/git-send-email.txt:410
 #, 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:402
+#: en/git-send-email.txt:413
 #, priority:100
 msgid "Do everything except actually send the emails."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:403
+#: en/git-send-email.txt:414
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
 msgstr "--[no-]format-patch"
 
 #. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:419
 #, 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:412
+#: en/git-send-email.txt:423
 #, 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:413
+#: en/git-send-email.txt:424
 #, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
 msgstr "--[no-]validate"
 
 #. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:427
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:419
+#: en/git-send-email.txt:430
 #, priority:100
 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:431
 #, priority:100
 msgid "Warn of patches that contain lines longer than"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:424
+#: en/git-send-email.txt:435
 #, no-wrap, priority:100
 msgid ""
 "998 characters unless a suitable transfer encoding\n"
@@ -47393,151 +47441,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:439
 #, 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:431
+#: en/git-send-email.txt:442
 #, priority:100
 msgid "Send emails even if safety checks would prevent it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-send-email.txt:434
+#: en/git-send-email.txt:445
 #, no-wrap, priority:100
 msgid "Information"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-send-email.txt:436
+#: en/git-send-email.txt:447
 #, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
 msgstr "--dump-aliases"
 
 #. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:452
 #, 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:446
+#: en/git-send-email.txt:457
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
 msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
-#: en/git-send-email.txt:449
+#: en/git-send-email.txt:460
 #, 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:450
+#: en/git-send-email.txt:461
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
 msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
-#: en/git-send-email.txt:453
+#: en/git-send-email.txt:464
 #, 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:458
+#: en/git-send-email.txt:469
 #, 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:460
+#: en/git-send-email.txt:471
 #, no-wrap, priority:100
 msgid "sendmail"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:462
+#: en/git-send-email.txt:473
 #, priority:100
 msgid "Quoted aliases and quoted addresses are not supported: lines that"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:474
 #, priority:100
 msgid "contain a `\"` symbol are ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:464
+#: en/git-send-email.txt:475
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:465
+#: en/git-send-email.txt:476
 #, priority:100
 msgid "supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:466
+#: en/git-send-email.txt:477
 #, priority:100
 msgid "File inclusion (`:include: /path/name`) is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:467
+#: en/git-send-email.txt:478
 #, priority:100
 msgid "Warnings are printed on the standard error output for any"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:480
 #, 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:471
+#: en/git-send-email.txt:482
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
 msgstr "sendemail.multiEdit"
 
 #. type: Plain text
-#: en/git-send-email.txt:476
+#: en/git-send-email.txt:487
 #, 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:477
+#: en/git-send-email.txt:488
 #, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
 msgstr "sendemail.confirm"
 
 #. type: Plain text
-#: en/git-send-email.txt:481
+#: en/git-send-email.txt:492
 #, 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:485
+#: en/git-send-email.txt:496
 #, no-wrap, priority:100
 msgid "Use gmail as the smtp server"
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:488
+#: en/git-send-email.txt:499
 #, 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: delimited block -
-#: en/git-send-email.txt:495
+#: en/git-send-email.txt:506
 #, no-wrap, priority:100
 msgid ""
 "[sendemail]\n"
@@ -47548,25 +47596,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:500
+#: en/git-send-email.txt:511
 #, priority:100
 msgid "If you have multi-factor authentication set up 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:504
+#: en/git-send-email.txt:515
 #, priority:100
 msgid "If you do not have multi-factor authentication set up on your Gmail account, you will need to allow less secure app access. Visit https://myaccount.google.com/lesssecureapps to enable it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:507
+#: en/git-send-email.txt:518
 #, 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:511
+#: en/git-send-email.txt:522
 #, no-wrap, priority:100
 msgid ""
 "\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -47575,19 +47623,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:527
 #, 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:522
+#: en/git-send-email.txt:533
 #, 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:527
+#: en/git-send-email.txt:538
 #, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr ""
@@ -49235,253 +49283,253 @@ msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:96
+#: en/git-stash.txt:98
 #, 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.  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.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior."
+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.  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).  If no `<diff-option>` is provided, the default behavior will be given by the `stash.showStat`, and `stash.showPatch` config variables. You can also use `stash.showIncludeUntracked` to set whether `--include-untracked` is enabled by default."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:97
+#: en/git-stash.txt:99
 #, no-wrap, priority:240
 msgid "pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:103
+#: en/git-stash.txt:105
 #, 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:107
+#: en/git-stash.txt:109
 #, 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: Labeled list
-#: en/git-stash.txt:108
+#: en/git-stash.txt:110
 #, no-wrap, priority:240
 msgid "apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:113
+#: en/git-stash.txt:115
 #, 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:114
+#: en/git-stash.txt:116
 #, no-wrap, priority:240
 msgid "branch <branchname> [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:121
+#: en/git-stash.txt:123
 #, 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>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:129
 #, 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:128
+#: en/git-stash.txt:130
 #, no-wrap, priority:240
 msgid "clear"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:132
+#: en/git-stash.txt:134
 #, 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:133
+#: en/git-stash.txt:135
 #, no-wrap, priority:240
 msgid "drop [-q|--quiet] [<stash>]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:136
+#: en/git-stash.txt:138
 #, priority:240
 msgid "Remove a single stash entry from the list of stash entries."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:137 en/git-update-ref.txt:108
+#: en/git-stash.txt:139 en/git-update-ref.txt:108
 #, ignore-same, no-wrap, priority:240
 msgid "create"
 msgstr "create"
 
 #. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:146
 #, 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:145
+#: en/git-stash.txt:147
 #, no-wrap, priority:240
 msgid "store"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:151
+#: en/git-stash.txt:153
 #, 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:157 en/git-stash.txt:188 en/git-stash.txt:194
+#: en/git-stash.txt:159 en/git-stash.txt:190 en/git-stash.txt:196
 #, priority:240
 msgid "This option is only valid for `push` and `save` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:162
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:162
+#: en/git-stash.txt:164
 #, ignore-same, no-wrap, priority:240
 msgid "--include-untracked"
 msgstr "--include-untracked"
 
 #. type: Labeled list
-#: en/git-stash.txt:163
+#: en/git-stash.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--no-include-untracked"
 msgstr "--no-include-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:167
+#: en/git-stash.txt:169
 #, priority:240
 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:170
+#: en/git-stash.txt:172
 #, priority:240
 msgid "When used with the `show` command, show the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:171
+#: en/git-stash.txt:173
 #, ignore-same, no-wrap, priority:240
 msgid "--only-untracked"
 msgstr "--only-untracked"
 
 #. type: Plain text
-#: en/git-stash.txt:173
+#: en/git-stash.txt:175
 #, priority:240
 msgid "This option is only valid for the `show` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:175
+#: en/git-stash.txt:177
 #, priority:240
 msgid "Show only the untracked files in the stash entry as part of the diff."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:178
+#: en/git-stash.txt:180
 #, priority:240
 msgid "This option is only valid for `pop` and `apply` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:183
+#: en/git-stash.txt:185
 #, priority:240
 msgid "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: Labeled list
-#: en/git-stash.txt:185
+#: en/git-stash.txt:187
 #, ignore-same, no-wrap, priority:240
 msgid "--keep-index"
 msgstr "--keep-index"
 
 #. type: Labeled list
-#: en/git-stash.txt:186
+#: en/git-stash.txt:188
 #, ignore-same, no-wrap, priority:240
 msgid "--no-keep-index"
 msgstr "--no-keep-index"
 
 #. type: Plain text
-#: en/git-stash.txt:190
+#: en/git-stash.txt:192
 #, priority:240
 msgid "All changes already added to the index are left intact."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:202
+#: en/git-stash.txt:204
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:205
+#: en/git-stash.txt:207
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:208 en/git-stash.txt:218 en/git-stash.txt:232 en/git-stash.txt:237
+#: en/git-stash.txt:210 en/git-stash.txt:220 en/git-stash.txt:234 en/git-stash.txt:239
 #, priority:240
 msgid "This option is only valid for `push` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:227
+#: en/git-stash.txt:229
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:234
+#: en/git-stash.txt:236
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:242
+#: en/git-stash.txt:244
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:245
+#: en/git-stash.txt:247
 #, no-wrap, priority:240
 msgid "<stash>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:248
+#: en/git-stash.txt:250
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:251
+#: en/git-stash.txt:253
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:260
+#: en/git-stash.txt:262
 #, 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:264
+#: en/git-stash.txt:266
 #, no-wrap, priority:240
 msgid ""
 "            .----W\n"
@@ -49490,31 +49538,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:268
+#: en/git-stash.txt:270
 #, 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:273
+#: en/git-stash.txt:275
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:279
+#: en/git-stash.txt:281
 #, 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:284
+#: en/git-stash.txt:286
 #, 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:292
+#: en/git-stash.txt:294
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git pull\n"
@@ -49526,13 +49574,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:300
+#: en/git-stash.txt:302
 #, 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:311
+#: en/git-stash.txt:313
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49547,13 +49595,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:314
+#: en/git-stash.txt:316
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-stash.txt:322
+#: en/git-stash.txt:324
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49565,19 +49613,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:324
+#: en/git-stash.txt:326
 #, no-wrap, priority:240
 msgid "Testing partial commits"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:329
+#: en/git-stash.txt:331
 #, 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:340
+#: en/git-stash.txt:342
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "# ... hack hack hack ...\n"
@@ -49592,19 +49640,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-stash.txt:342
+#: en/git-stash.txt:344
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:348
+#: en/git-stash.txt:350
 #, 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:353
+#: en/git-stash.txt:355
 #, no-wrap, priority:240
 msgid ""
 "git fsck --unreachable |\n"
@@ -49613,7 +49661,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-stash.txt:363
+#: en/git-stash.txt:365
 #, 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]"
@@ -51713,7 +51761,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1069
+#: en/git-svn.txt:346 en/rev-list-options.txt:1077
 #, ignore-same, no-wrap, priority:260
 msgid "--parents"
 msgstr "--parents"
@@ -57831,7 +57879,7 @@ msgstr ""
 #: en/git-worktree.txt:20
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <string>] <worktree>\n"
 "'git worktree move' <worktree> <new-path>\n"
@@ -58138,7 +58186,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-worktree.txt:246
 #, priority:240
-msgid "With `lock`, an explanation why the working tree is locked."
+msgid "With `lock` or with `add --lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
@@ -58331,7 +58379,7 @@ msgstr ""
 msgid ""
 "$ git worktree list\n"
 "/path/to/linked-worktree    abcd1234 [master]\n"
-"/path/to/locked-worktreee   acbd5678 (brancha) locked\n"
+"/path/to/locked-worktree    acbd5678 (brancha) locked\n"
 "/path/to/prunable-worktree  5678abc  (detached HEAD) prunable\n"
 msgstr ""
 
@@ -58809,7 +58857,7 @@ msgstr ""
 #. type: Plain text
 #: en/glossary-content.txt:153
 #, priority:100
-msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
 msgstr ""
 
 #. type: Labeled list
@@ -62505,194 +62553,230 @@ msgstr ""
 msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
 msgstr ""
 
-#. type: Title ~
+#. type: Plain text
 #: en/revisions.txt:265
+#, priority:100
+msgid "There are several notations to specify a set of connected commits (called a \"revision range\"), illustrated below."
+msgstr ""
+
+#. type: Title ~
+#: en/revisions.txt:268
 #, no-wrap, priority:100
 msgid "Commit Exclusions"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:267
+#: en/revisions.txt:270
 #, no-wrap, priority:100
 msgid "'{caret}<rev>' (caret) Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:272
+#: en/revisions.txt:275
 #, 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:274
+#: en/revisions.txt:277
 #, no-wrap, priority:100
 msgid "Dotted Range Notations"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:276
+#: en/revisions.txt:279
 #, no-wrap, priority:100
 msgid "The '..' (two-dot) Range Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:282
+#: en/revisions.txt:285
 #, 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:283
+#: en/revisions.txt:286
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "The '...' (three-dot) Symmetric Difference Notation"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:289
+#: en/revisions.txt:292
 #, 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:296
+#: en/revisions.txt:299
 #, 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: Plain text
+#: en/revisions.txt:306
+#, priority:100
+msgid "Commands that are specifically designed to take two distinct ranges (e.g. \"git range-diff R1 R2\" to compare two ranges) do exist, but they are exceptions.  Unless otherwise noted, all \"git\" commands that operate on a set of commits work on a single revision range.  In other words, writing two \"two-dot range notation\" next to each other, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:308
+#, no-wrap, priority:100
+msgid "    $ git log A..B C..D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:313
+#, priority:100
+msgid "does *not* specify two revision ranges for most commands.  Instead it will name a single connected set of commits, i.e. those that are reachable from either B or D but are reachable from neither A or C.  In a linear history like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:315
+#, no-wrap, priority:100
+msgid "    ---A---B---o---o---C---D\n"
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:318
+#, priority:100
+msgid "because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D."
+msgstr ""
+
 #. type: Title ~
-#: en/revisions.txt:298
+#: en/revisions.txt:321
 #, no-wrap, priority:100
 msgid "Other <rev>{caret} Parent Shorthand Notations"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:324
 #, 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:303
+#: en/revisions.txt:326
 #, priority:100
 msgid "The 'r1{caret}@' notation means all parents of 'r1'."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:306
+#: en/revisions.txt:329
 #, 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:313
+#: en/revisions.txt:336
 #, 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:317
+#: en/revisions.txt:340
 #, 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:319
+#: en/revisions.txt:342
 #, no-wrap, priority:100
 msgid "Revision Range Summary"
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:321
+#: en/revisions.txt:344
 #, no-wrap, priority:100
 msgid "'<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:324
+#: en/revisions.txt:347
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:325
+#: en/revisions.txt:348
 #, no-wrap, priority:100
 msgid "'{caret}<rev>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:328
+#: en/revisions.txt:351
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
 msgstr ""
 
 #. type: Labeled list
-#: en/revisions.txt:329
+#: en/revisions.txt:352
 #, no-wrap, priority:100
 msgid "'<rev1>..<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:333
+#: en/revisions.txt:356
 #, 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:334
+#: en/revisions.txt:357
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'<rev1>\\...<rev2>'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:338
+#: en/revisions.txt:361
 #, 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:339
+#: en/revisions.txt:362
 #, no-wrap, priority:100
 msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:343
+#: en/revisions.txt:366
 #, 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:344
+#: en/revisions.txt:367
 #, no-wrap, priority:100
 msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:348
+#: en/revisions.txt:371
 #, 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:349
+#: en/revisions.txt:372
 #, no-wrap, priority:100
 msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:352
+#: en/revisions.txt:375
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
 msgstr ""
 
 #. type: Plain text
-#: en/revisions.txt:356
+#: en/revisions.txt:379
 #, 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:380
+#: en/revisions.txt:403
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "   Args   Expanded arguments    Selected commits\n"
@@ -64270,7 +64354,7 @@ msgstr ""
 #. type: Plain text
 #: en/rev-list-options.txt:902
 #, 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."
+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 required for a sparse checkout on the requested refs."
 msgstr ""
 
 #. type: Plain text
@@ -64531,56 +64615,80 @@ msgstr "--header"
 msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
 msgstr ""
 
+#. type: Labeled list
+#: en/rev-list-options.txt:1068
+#, ignore-same, no-wrap, priority:260
+msgid "--no-commit-header"
+msgstr "--no-commit-header"
+
 #. type: Plain text
 #: en/rev-list-options.txt:1072
+#, priority:260
+msgid "Suppress the header line containing \"commit\" and the object ID printed before the specified format.  This has no effect on the built-in formats; only custom formats are affected."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:1073
+#, ignore-same, no-wrap, priority:260
+msgid "--commit-header"
+msgstr "--commit-header"
+
+#. type: Plain text
+#: en/rev-list-options.txt:1075
+#, priority:260
+msgid "Overrides a previous `--no-commit-header`."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:1080
 #, 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:1073
+#: en/rev-list-options.txt:1081
 #, ignore-same, no-wrap, priority:260
 msgid "--children"
 msgstr "--children"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1076
+#: en/rev-list-options.txt:1084
 #, 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:1078
+#: en/rev-list-options.txt:1086
 #, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
 msgstr "--timestamp"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1080
+#: en/rev-list-options.txt:1088
 #, priority:260
 msgid "Print the raw commit timestamp."
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1082
+#: en/rev-list-options.txt:1090
 #, ignore-same, no-wrap, priority:260
 msgid "--left-right"
 msgstr "--left-right"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1095
 #, 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:1089
+#: en/rev-list-options.txt:1097
 #, priority:260
 msgid "For example, if you have this topology:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1104
 #, no-wrap, priority:260
 msgid ""
 "\t     y---b---b  branch B\n"
@@ -64591,19 +64699,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1107
 #, priority:260
 msgid "you would get an output like this:"
 msgstr ""
 
 #. type: delimited block -
-#: en/rev-list-options.txt:1102
+#: en/rev-list-options.txt:1110
 #, 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:1109
+#: en/rev-list-options.txt:1117
 #, ignore-ellipsis, no-wrap, priority:260
 msgid ""
 "\t>bbbbbbb... 3rd on b\n"
@@ -64615,43 +64723,43 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/rev-list-options.txt:1111
+#: en/rev-list-options.txt:1119
 #, ignore-same, no-wrap, priority:260
 msgid "--graph"
 msgstr "--graph"
 
 #. type: Plain text
-#: en/rev-list-options.txt:1117
+#: en/rev-list-options.txt:1125
 #, 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:1119
+#: en/rev-list-options.txt:1127
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1122
+#: en/rev-list-options.txt:1130
 #, 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:1123
+#: en/rev-list-options.txt:1131
 #, no-wrap, priority:260
 msgid "--show-linear-break[=<barrier>]"
 msgstr ""
 
 #. type: Plain text
-#: en/rev-list-options.txt:1129
+#: en/rev-list-options.txt:1137
 #, 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:1139
+#: en/rev-list-options.txt:1147
 #, 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 ""